Changeset 7093

Timestamp:

May 27, 2009, 8:24:34 AM (16 years ago)

Author:

rwilson

Message:

Fixed bug with Windows resource logging function.

File:

• branches/numpy/anuga/utilities/log.py (modified) (3 diffs)

branches/numpy/anuga/utilities/log.py

@@ -198 +198 @@
     '''Log memory usage at given log level.'''
 
+    _scale = {'KB': 1024, 'MB': 1024*1024, 'GB': 1024*1024*1024,
+              'kB': 1024, 'mB': 1024*1024, 'gB': 1024*1024*1024}
+
     if sys.platform != 'win32':
         _proc_status = '/proc/%d/status' % os.getpid()
-        _scale = {'KB': 1024, 'MB': 1024*1024, 'GB': 1024*1024*1024,
-                  'kB': 1024, 'mB': 1024*1024, 'gB': 1024*1024*1024}
-
+        
         def _VmB(VmKey):
             '''Get number of virtual bytes used.'''
@@ -275 +276 @@
 
 if __name__ == '__main__':
-##    critical('Testing exception capturing')
+    critical('#' * 80)
+    warning('Test of logging...')
     def test_it(num=100):
         if num > 0:
@@ -286 +288 @@
     a = num.zeros((1000,1000), num.float)
 
-    test_it()
     info('sys.version_info=%s, _new_python=%s'
          % (str(sys.version_info), str(_new_python)))
+    test_it()