[pypy-commit] benchmarks default: (cfbolz, arigo)

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r283:56cceac3bdf5
Date: 2014-12-08 15:45 +0000
http://bitbucket.org/pypy/benchmarks/changeset/56cceac3bdf5/

Log:	(cfbolz, arigo)

	Add bm_krakatau.

diff --git a/benchmarks.py b/benchmarks.py
--- a/benchmarks.py
+++ b/benchmarks.py
@@ -82,7 +82,7 @@
              'spectral-norm', 'chaos', 'telco', 'go', 'pyflate-fast',
              'raytrace-simple', 'crypto_pyaes', 'bm_mako', 'bm_chameleon',
              'json_bench', 'pidigits', 'hexiom2', 'eparse', 'deltablue',
-             'bm_dulwich_log']:
+             'bm_dulwich_log', 'bm_krakatau']:
     _register_new_bm(name, name, globals(), **opts.get(name, {}))
 
 for name in ['names', 'iteration', 'tcp', 'pb', ]:#'web']:#, 'accepts']:
diff --git a/own/bm_krakatau.py b/own/bm_krakatau.py
--- a/own/bm_krakatau.py
+++ b/own/bm_krakatau.py
@@ -1,9 +1,9 @@
-import sys, os
+import sys, os, cStringIO
 import time
 import util, optparse
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'krakatau/Krakatau'))
-print sys.path
+this_dir = os.path.dirname(__file__)
+sys.path.insert(0, os.path.join(this_dir, 'krakatau/Krakatau'))
 
 import Krakatau.ssa
 from Krakatau.environment import Environment
@@ -34,7 +34,7 @@
     return s
 
 def decompileClass():
-    path = ['krakatau/rt.jar']
+    path = [os.path.join(this_dir, 'krakatau/rt.jar')]
     targets = ['javax/swing/plaf/nimbus/ToolBarSouthState']
     e = Environment()
     for part in path:
@@ -49,11 +49,16 @@
 
 def main(n):
     l = []
-    for i in range(n):
-        t0 = time.time()
-        decompileClass()
-        time_elapsed = time.time() - t0
-        l.append(time_elapsed)
+    old_stdout = sys.stdout
+    sys.stdout = cStringIO.StringIO()
+    try:
+        for i in range(n):
+            t0 = time.time()
+            decompileClass()
+            time_elapsed = time.time() - t0
+            l.append(time_elapsed)
+    finally:
+        sys.stdout = old_stdout
     return l
 
 if __name__ == "__main__":