diff options
| author | KWSys Robot <kwrobot@kitware.com> | 2014-12-16 13:48:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-12-17 20:00:15 (GMT) |
| commit | 6a5ab894fbb1683ed24bfa5d603eff6ff3f40039 (patch) | |
| tree | 867c986fef9b381c24822037a87c4d3e7c5db572 /SystemInformation.cxx | |
| parent | c5fcbe00afb27fc758e8877efa955e86109a0c67 (diff) | |
| download | CMake-6a5ab894fbb1683ed24bfa5d603eff6ff3f40039.zip CMake-6a5ab894fbb1683ed24bfa5d603eff6ff3f40039.tar.gz CMake-6a5ab894fbb1683ed24bfa5d603eff6ff3f40039.tar.bz2 | |
KWSys 2014-12-16 (cc4046a8)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ cc4046a8 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' dec9c30b..cc4046a8
Brad King (2):
9c3eacf8 Add CONTRIBUTING.rst file with instructions to contribute
cc4046a8 Directory: Work around PGI problem with Linux Large File Support
Jean-Christophe Fillion-Robin (2):
c38ba638 SystemInformation: Improve Get(Available/Total)VirtualMemory for windows
58308145 SystemInformation: Improve comments in private implementation
Change-Id: Ic033444a9c03a8a8b5195e7dac108af2aec79fa6
Diffstat (limited to 'SystemInformation.cxx')
| -rw-r--r-- | SystemInformation.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/SystemInformation.cxx b/SystemInformation.cxx index 3e1a1ab..3d5e728 100644 --- a/SystemInformation.cxx +++ b/SystemInformation.cxx @@ -443,7 +443,7 @@ public: }; protected: - // Functions. + // For windows bool RetrieveCPUFeatures(); bool RetrieveCPUIdentity(); bool RetrieveCPUCacheDetails(); @@ -457,6 +457,7 @@ protected: bool RetrieveClassicalCPUIdentity(); bool RetrieveExtendedCPUIdentity(); + // Processor information Manufacturer ChipManufacturer; CPUFeatures Features; ID ChipID; @@ -464,11 +465,11 @@ protected: unsigned int NumberOfLogicalCPU; unsigned int NumberOfPhysicalCPU; - int CPUCount(); + int CPUCount(); // For windows unsigned char LogicalCPUPerPhysicalCPU(); - unsigned char GetAPICId(); + unsigned char GetAPICId(); // For windows bool IsHyperThreadingSupported(); - static LongLong GetCyclesDifference(DELAY_FUNC, unsigned int); + static LongLong GetCyclesDifference(DELAY_FUNC, unsigned int); // For windows // For Linux and Cygwin, /proc/cpuinfo formats are slightly different bool RetreiveInformationFromCpuInfoFile(); @@ -3753,9 +3754,9 @@ bool SystemInformationImplementation::QueryWindowsMemory() } # define MEM_VAL(value) ull##value # endif - tv = ms.MEM_VAL(TotalVirtual); + tv = ms.MEM_VAL(TotalPageFile); tp = ms.MEM_VAL(TotalPhys); - av = ms.MEM_VAL(AvailVirtual); + av = ms.MEM_VAL(AvailPageFile); ap = ms.MEM_VAL(AvailPhys); this->TotalVirtualMemory = tv>>10>>10; this->TotalPhysicalMemory = tp>>10>>10; |