- This patch ports the functionality contained in the bin/avgtime perl
script to a python function called avgtime_print() in bin/autotest_utils.py.
- Additionally, it removes the existing perl script.
- Documentation in the new function attempts to follow the pydoc
standards.
- The eventual print of the averages uses two decimal places (except the
percent is integral).
I tested this against a handful of input, and the output of this python
version and the existing perl version were numerically identical (except
for the difference in the number of decimal points in the output).
Also, I grepped for callers of avgtime and didn't find any, but those
will need to be updated as well.
Note that this exercise was academic more than anything, as I need to
learn python and this was pretty basic. Feedback (private or public) on
any python best-practices I might have violated is appreciated.
Signed-off-by: Dustin Kirkland <[email protected]>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@172 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/bin/autotest_utils.py b/bin/autotest_utils.py
index 3033a66..0a91b32 100755
--- a/bin/autotest_utils.py
+++ b/bin/autotest_utils.py
@@ -3,7 +3,7 @@
import os,os.path,shutil,urllib,sys,signal,commands,pickle
from error import *
-import re
+import re,string
def grep(pattern, file):
"""This is mainly to fix the return code inversion from grep"""
@@ -302,6 +302,33 @@
return newpath
+def avgtime_print(dir):
+ """ Calculate some benchmarking statistics.
+ Input is a directory containing a file called 'time'.
+ File contains one-per-line results of /usr/bin/time.
+ Output is average Elapsed, User, and System time in seconds,
+ and average CPU percentage.
+ """
+ f = open(dir + "/time")
+ user = system = elapsed = cpu = count = 0
+ r = re.compile('([\d\.]*)user ([\d\.]*)system (\d*):([\d\.]*)elapsed (\d*)%CPU')
+ for line in f.readlines():
+ try:
+ s = r.match(line);
+ user += string.atof(s.group(1))
+ system += string.atof(s.group(2))
+ elapsed += (string.atof(s.group(3)) * 60) + \
+ string.atof(s.group(4))
+ cpu += string.atof(s.group(5))
+ count += 1
+ except:
+ raise ValueError("badly formatted times")
+
+ f.close()
+ return "Elapsed: %0.2fs User: %0.2fs System: %0.2fs CPU: %0.0f%%" % \
+ (elapsed/count, user/count, system/count, cpu/count)
+
+
class fd_stack:
"""a stack of fd redirects
