Changeset 7035 for branches/numpy/anuga/utilities/log.py

Timestamp:

May 14, 2009, 2:24:54 PM (15 years ago)

Author:

rwilson

Message:

Back-merge from Numeric trunk.

File:

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

branches/numpy/anuga/utilities/log.py

@@ -24 +24 @@
 '''
 
-import sys
 import os
 import sys
@@ -60 +59 @@
 NOTSET = logging.NOTSET
 
-# get True if python version 2.5 or later
+# set new_python to True if python version 2.5 or later
 (version_major, version_minor, _, _, _) = sys.version_info
 new_python = ((version_major == 2 and version_minor >= 5) or version_major > 2)
@@ -103 +102 @@
         console.setFormatter(formatter)
         logging.getLogger('').addHandler(console)
+
+        # catch exceptions
+        sys.excepthook = log_exception_hook
 
         # tell the world how we are set up
@@ -122 +124 @@
     frames = traceback.extract_stack()
     frames.reverse()
-    (_, mod_name) = __name__.rsplit('.', 1)
+    try:
+        (_, mod_name) = __name__.rsplit('.', 1)
+    except ValueError:
+        mod_name = __name__
     for (fpath, lnum, mname, _) in frames:
         (fname, _) = os.path.basename(fpath).rsplit('.', 1)
@@ -133 +138 @@
         logging.log(level, msg)
 
+##
+# @brief Hook function to process uncaught exceptions.
+# @param type
+# @param value
+# @param traceback
+# @note Same interface as sys.excepthook()
+def log_exception_hook(type, value, tb):
+    msg = ''.join(traceback.format_exception(type, value, tb))
+    critical(msg)
+
+    
 ################################################################################
 # Shortcut routines to make for simpler user code.
@@ -176 +192 @@
     if sys.platform != 'win32':
         _proc_status = '/proc/%d/status' % os.getpid()
-        _scale = {'KB': 1024.0, 'MB': 1024.0*1024.0, 'GB': 1024.0*1024.0*1024.0,
-                  'kB': 1024.0, 'mB': 1024.0*1024.0, 'gB': 1024.0*1024.0*1024.0}
+        _scale = {'KB': 1024, 'MB': 1024*1024, 'GB': 1024*1024*1024,
+                  'kB': 1024, 'mB': 1024*1024, 'gB': 1024*1024*1024}
 
         def _VmB(VmKey):
@@ -214 +230 @@
             return _VmB('VmStk:') - since
 
-        msg = ('Resource usage: memory=%.1f resident=%.1f stacksize=%.1f'
-               % (memory()/_scale['GB'], resident()/_scale['GB'],
-                  stacksize()/_scale['GB']))
+        msg = ('Resource usage: memory=%.1fMB resident=%.1fMB stacksize=%.1fMB'
+               % (memory()/_scale['MB'], resident()/_scale['MB'],
+                  stacksize()/_scale['MB']))
         log(level, msg)
     else:
-        pass
+        msg = ('Sorry, no memory statistics for Windows (yet).')
+        log(level, msg)
+
+
+if __name__ == '__main__':
+##    critical('Testing exception capturing')
+    def test_it(num=100):
+        if num > 0:
+            test_it(num-1)
+        else:
+            resource_usage()
+
+    import numpy as num
+    
+    a = num.zeros((1000,1000), num.float)
+
+    test_it()