← Back to branch summary

~evarlast/ubuntu/utopic/mongodb/upstart-workaround-debian-bug-718702

« back to all changes in this revision

Viewing changes to src/mongo/util/processinfo_linux2.cpp

  • Committer: Package Import Robot
  • Author(s): James Page, James Page, Robie Basak
  • Date: 2013-05-29 17:44:42 UTC
  • mfrom: (44.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20130529174442-z0a4qmoww4y0t458
Tags: 1:2.4.3-1ubuntu1
[ James Page ]
* Merge from Debian unstable, remaining changes:
  - Enable SSL support:
    + d/control: Add libssl-dev to BD's.
    + d/rules: Enabled --ssl option.
    + d/mongodb.conf: Add example SSL configuration options.
  - d/mongodb-server.mongodb.upstart: Add upstart configuration.
  - d/rules: Don't strip binaries during scons build for Ubuntu.
  - d/control: Add armhf to target archs.
  - d/p/SConscript.client.patch: fixup install of client libraries.
  - d/p/0010-install-libs-to-usr-lib-not-usr-lib64-Closes-588557.patch:
    Install libraries to lib not lib64.
* Dropped changes:
  - d/p/arm-support.patch: Included in Debian.
  - d/p/double-alignment.patch: Included in Debian.
  - d/rules,control: Debian also builds with avaliable system libraries
    now.
* Fix FTBFS due to gcc and boost upgrades in saucy:
  - d/p/0008-ignore-unused-local-typedefs.patch: Add -Wno-unused-typedefs
    to unbreak building with g++-4.8.
  - d/p/0009-boost-1.53.patch: Fixup signed/unsigned casting issue.

[ Robie Basak ]
* d/p/0011-Use-a-signed-char-to-store-BSONType-enumerations.patch: Fixup
  build failure on ARM due to missing signed'ness of char cast.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mongo/util/processinfo_linux2.cpp
380
380
        //docs claim hblkhd is included in uordblks but it isn't
381
381
 
382
382
        LinuxProc p(_pid);
383
 
        info.append("page_faults", (int)p._maj_flt);
 
383
        info.appendNumber("page_faults", static_cast<long long>(p._maj_flt) );
384
384
    }
385
385
 
386
386
    /**
406
406
        memSize = LinuxSysHelper::getSystemMemorySize();
407
407
        addrSize = (string( unameData.machine ).find( "x86_64" ) != string::npos ? 64 : 32);
408
408
        numCores = cpuCount;
 
409
        pageSize = static_cast<unsigned long long>(sysconf( _SC_PAGESIZE ));
409
410
        cpuArch = unameData.machine;
410
411
        hasNuma = checkNumaEnabled();
411
412
        
419
420
        bExtra.append( "kernelVersion", unameData.release );
420
421
        bExtra.append( "cpuFrequencyMHz", cpuFreq);
421
422
        bExtra.append( "cpuFeatures", cpuFeatures);
422
 
        bExtra.append( "pageSize", static_cast< int >(sysconf( _SC_PAGESIZE ) ) );
 
423
        bExtra.append( "pageSize", static_cast<long long>(pageSize) );
423
424
        bExtra.append( "numPages", static_cast< int >(sysconf( _SC_PHYS_PAGES ) ) );
424
425
        bExtra.append( "maxOpenFiles", static_cast< int >(sysconf( _SC_OPEN_MAX ) ) );
425
426
 
450
451
        return true;
451
452
    }
452
453
 
453
 
    bool ProcessInfo::blockInMemory( char * start ) {
454
 
        static long pageSize = 0;
455
 
        if ( pageSize == 0 ) {
456
 
            pageSize = sysconf( _SC_PAGESIZE );
457
 
        }
458
 
        start = start - ( (unsigned long long)start % pageSize );
 
454
    bool ProcessInfo::blockInMemory(const void* start) {
459
455
        unsigned char x = 0;
460
 
        if ( mincore( start , 128 , &x ) ) {
 
456
        if (mincore(const_cast<void*>(alignToStartOfPage(start)), getPageSize(), &x)) {
461
457
            log() << "mincore failed: " << errnoWithDescription() << endl;
462
458
            return 1;
463
459
        }
464
460
        return x & 0x1;
465
461
    }
466
462
 
 
463
    bool ProcessInfo::pagesInMemory(const void* start, size_t numPages, vector<char>* out) {
 
464
        out->resize(numPages);
 
465
        if (mincore(const_cast<void*>(alignToStartOfPage(start)), numPages * getPageSize(),
 
466
                    reinterpret_cast<unsigned char*>(&out->front()))) {
 
467
            log() << "mincore failed: " << errnoWithDescription() << endl;
 
468
            return false;
 
469
        }
 
470
        for (size_t i = 0; i < numPages; ++i) {
 
471
            (*out)[i] &= 0x1; 
 
472
        }
 
473
        return true;
 
474
    }
467
475
 
468
476
}