Random changes.

1 files changed, 27 insertions, 16 deletions

diff --git a/bootstrap.py b/bootstrap.py
index da421b6..3c886ef 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -3,13 +3,14 @@
 import functools
 import logging
 import os
+import pdb
 import sys
-import time
 import traceback
 
 # This module is commonly used by others in here and should avoid
 # taking any unnecessary dependencies back on them.
-import argparse_utils
+
+from argparse_utils import ActionNoYes
 import config
 
 
@@ -20,9 +21,9 @@ args = config.add_commandline_args(
     'Args related to python program bootstrapper and Swiss army knife')
 args.add_argument(
     '--debug_unhandled_exceptions',
-    action=argparse_utils.ActionNoYes,
+    action=ActionNoYes,
     default=False,
-    help='Break into debugger on top level unhandled exceptions for interactive debugging'
+    help='Break into pdb on top level unhandled exceptions.'
 )
 
 
@@ -38,31 +39,41 @@ def handle_uncaught_exception(
     traceback.print_exception(exc_type, exc_value, exc_traceback)
     if config.config['debug_unhandled_exceptions']:
         logger.info("Invoking the debugger...")
-        breakpoint()
+        pdb.pm()
 
 
-def initialize(funct):
-    import logging_utils
+def initialize(entry_point):
 
     """Remember to initialize config and logging before running main."""
-    @functools.wraps(funct)
+    @functools.wraps(entry_point)
     def initialize_wrapper(*args, **kwargs):
         sys.excepthook = handle_uncaught_exception
-        config.parse()
+        config.parse(entry_point.__globals__['__file__'])
+
+        import logging_utils
         logging_utils.initialize_logging(logging.getLogger())
+
         config.late_logging()
-        logger.debug(f'Starting {funct.__name__}')
-        start = time.perf_counter()
-        ret = funct(*args, **kwargs)
-        end = time.perf_counter()
-        logger.debug(f'{funct} returned {ret}.')
+
+        logger.debug(f'Starting {entry_point.__name__} (program entry point)')
+
+        ret = None
+        import timer
+        with timer.Timer() as t:
+            ret = entry_point(*args, **kwargs)
+        logger.debug(
+            f'{entry_point.__name__} (program entry point) returned {ret}.'
+        )
+
+        walltime = t()
         (utime, stime, cutime, cstime, elapsed_time) = os.times()
-        logger.debug(f'\nuser: {utime}s\n'
+        logger.debug(f'\n'
+                     f'user: {utime}s\n'
                      f'system: {stime}s\n'
                      f'child user: {cutime}s\n'
                      f'child system: {cstime}s\n'
                      f'elapsed: {elapsed_time}s\n'
-                     f'walltime: {end - start}s\n')
+                     f'walltime: {walltime}s\n')
         if ret != 0:
             logger.info(f'Exit {ret}')
         else: