[Cmake-commits] [cmake-commits] hoffman committed SystemInformation.cxx 1.24 1.25

cmake-commits at cmake.org cmake-commits at cmake.org
Fri May 2 11:44:28 EDT 2008


Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv31516

Modified Files:
	SystemInformation.cxx 
Log Message:
ENH: use GlobalMemoryStatusEx as it is able to report more than 2gigs 


Index: SystemInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** SystemInformation.cxx	2 May 2008 13:14:37 -0000	1.24
--- SystemInformation.cxx	2 May 2008 15:44:26 -0000	1.25
***************
*** 2229,2239 ****
    return 0;
  #elif _WIN32
!   MEMORYSTATUS ms;
!   GlobalMemoryStatus(&ms);
  
!   unsigned long tv = ms.dwTotalVirtual;
!   unsigned long tp = ms.dwTotalPhys;
!   unsigned long av = ms.dwAvailVirtual;
!   unsigned long ap = ms.dwAvailPhys;
    this->TotalVirtualMemory = tv>>10>>10;
    this->TotalPhysicalMemory = tp>>10>>10;
--- 2229,2239 ----
    return 0;
  #elif _WIN32
!   MEMORYSTATUSEX ms;
!   GlobalMemoryStatusEx(&ms);
  
!   unsigned long tv = ms.ullTotalVirtual;
!   unsigned long tp = ms.ullTotalPhys;
!   unsigned long av = ms.ullAvailVirtual;
!   unsigned long ap = ms.ullAvailPhys;
    this->TotalVirtualMemory = tv>>10>>10;
    this->TotalPhysicalMemory = tp>>10>>10;



More information about the Cmake-commits mailing list