From 713812bd0d077c421550395a6380a294fc9928a6 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sun, 20 Jan 2008 14:07:42 -0500
Subject: [PATCH] Default to wall time in log manager. Robustify timer
 selection.

---
 src/log.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/log.py b/src/log.py
index 9be0f7f..f11f3a8 100644
--- a/src/log.py
+++ b/src/log.py
@@ -7,13 +7,15 @@ from __future__ import division
 def time():
     """Return elapsed CPU time, as a float, in seconds."""
     import os
-    time_opt = os.environ.get("PYTOOLS_LOG_TIME")
+    time_opt = os.environ.get("PYTOOLS_LOG_TIME") or "wall"
     if time_opt == "wall":
         from time import time
         return time()
-    else:
+    elif time_opt == "rusage":
         from resource import getrusage, RUSAGE_SELF
         return getrusage(RUSAGE_SELF).ru_utime
+    else:
+        raise RuntimeError, "invalid timing method '%s'" % time_opt
 
 
 
-- 
GitLab