kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Commit a fix from Rusty to address incorrectly reported memory queries.

Browse Source
This commit is contained in:
Dave Partyka 2010-03-26 14:18:24 -04:00
parent e750761857
commit 9345833272
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/kwsys/SystemInformation.cxx
View File

@ -2395,11 +2395,13 @@ int SystemInformationImplementation::QueryMemory()
#elif _WIN32 #elif _WIN32
#if _MSC_VER < 1300 #if _MSC_VER < 1300
MEMORYSTATUS ms; MEMORYSTATUS ms;
unsigned long tv, tp, av, ap;
ms.dwLength = sizeof(ms); ms.dwLength = sizeof(ms);
GlobalMemoryStatus(&ms); GlobalMemoryStatus(&ms);
#define MEM_VAL(value) dw##value #define MEM_VAL(value) dw##value
#else #else
MEMORYSTATUSEX ms; MEMORYSTATUSEX ms;
DWORDLONG tv, tp, av, ap;
ms.dwLength = sizeof(ms); ms.dwLength = sizeof(ms);
if (0 == GlobalMemoryStatusEx(&ms)) if (0 == GlobalMemoryStatusEx(&ms))
{ {
@ -2407,10 +2409,10 @@ int SystemInformationImplementation::QueryMemory()
} }
#define MEM_VAL(value) ull##value #define MEM_VAL(value) ull##value
#endif #endif
unsigned long tv = ms.MEM_VAL(TotalVirtual); tv = ms.MEM_VAL(TotalVirtual);
unsigned long tp = ms.MEM_VAL(TotalPhys); tp = ms.MEM_VAL(TotalPhys);
unsigned long av = ms.MEM_VAL(AvailVirtual); av = ms.MEM_VAL(AvailVirtual);
unsigned long ap = ms.MEM_VAL(AvailPhys); ap = ms.MEM_VAL(AvailPhys);
this->TotalVirtualMemory = tv>>10>>10; this->TotalVirtualMemory = tv>>10>>10;
this->TotalPhysicalMemory = tp>>10>>10; this->TotalPhysicalMemory = tp>>10>>10;
this->AvailableVirtualMemory = av>>10>>10; this->AvailableVirtualMemory = av>>10>>10;