Changeset 7094

Timestamp:

May 27, 2009, 8:51:30 AM (16 years ago)

Author:

rwilson

Message:

Improved Windows code to something that will work after WinXp? (hopefully).

File:

• branches/numpy/anuga/utilities/log.py (modified) (1 diff)

branches/numpy/anuga/utilities/log.py

@@ -244 +244 @@
         log(level, msg)
     else:
-        # from http://code.activestate.com/recipes/511491/
+        # Windows code from: http://code.activestate.com/recipes/511491/
         try:
             import ctypes
             import _winreg
         except:
-            log(CRITICAL, 'Windows resource usage not available')
+            log(level, 'Windows resource usage not available')
             return
 
         kernel32 = ctypes.windll.kernel32
         c_ulong = ctypes.c_ulong
-        class MEMORYSTATUS(ctypes.Structure):
+        c_ulonglong = ctypes.c_ulonglong
+        class MEMORYSTATUSEX(ctypes.Structure):
             _fields_ = [('dwLength', c_ulong),
                         ('dwMemoryLoad', c_ulong),
-                        ('dwTotalPhys', c_ulong),
-                        ('dwAvailPhys', c_ulong),
-                        ('dwTotalPageFile', c_ulong),
-                        ('dwAvailPageFile', c_ulong),
-                        ('dwTotalVirtual', c_ulong),
-                        ('dwAvailVirtual', c_ulong)
+                        ('ullTotalPhys', c_ulonglong),
+                        ('ullAvailPhys', c_ulonglong),
+                        ('ullTotalPageFile', c_ulonglong),
+                        ('ullAvailPageFile', c_ulonglong),
+                        ('ullTotalVirtual', c_ulonglong),
+                        ('ullAvailVirtual', c_ulonglong),
+                        ('ullAvailExtendedVirtual', c_ulonglong)
                        ]
-            
-        memoryStatus = MEMORYSTATUS()
-        memoryStatus.dwLength = ctypes.sizeof(MEMORYSTATUS)
-        kernel32.GlobalMemoryStatus(ctypes.byref(memoryStatus))
+
+        memoryStatusEx = MEMORYSTATUSEX()
+        memoryStatus.dwLength = ctypes.sizeof(MEMORYSTATUSEX)
+        kernel32.GlobalMemoryStatusEx(ctypes.byref(memoryStatusEx))
 
         msg = ('Resource usage: total memory=%.1fMB free memory=%.1fMB'
-               % (memoryStatus.dwTotalPhys/_scale['MB'],
-                  memoryStatus.dwAvailPhys/_scale['MB']))
+               % (memoryStatusEx.ullTotalPhys/_scale['MB'],
+                  memoryStatusEx.ullAvailPhys/_scale['MB']))
         log(level, msg)