[pypy-svn] r59752 - pypy/build/benchmem/benchmark

[xoraxax at codespeak.net]

Author: xoraxax
Date: Thu Nov  6 23:45:17 2008
New Revision: 59752

Modified:
   pypy/build/benchmem/benchmark/appprofiles.py
   pypy/build/benchmem/benchmark/sizes.py
Log:
Move email function from sizes to approfiles, reduce tree depth of gcbench a bit.

Modified: pypy/build/benchmem/benchmark/appprofiles.py
==============================================================================
--- pypy/build/benchmem/benchmark/appprofiles.py	(original)
+++ pypy/build/benchmem/benchmark/appprofiles.py	Thu Nov  6 23:45:17 2008
@@ -71,8 +71,23 @@
 
 
 def bench_gcbench(iter1, iter2):
-    base_depth = int(math.log(iter1, 10) * 3)
+    base_depth = int(math.log(iter1, 10) * 2.5)
     gcbench.kStretchTreeDepth = base_depth + 2
     gcbench.kLongLivedTreeDepth = base_depth
     gcbench.main()
 
+
+import sys,new
+sys.modules['socket'] = new.module("socket")
+from email.Message import Message
+
+def bench_list_of_messages(iter1, iter2):
+    x = []
+    for i in range(iter1/10):
+        # make block-looking 40-lines, 72-columns e-mails
+        msg = Message()
+        msg.set_payload(('%072d' % i) * 40)
+        msg['Subject'] = '%60d' % i
+        msg['From'] = '%15d' % i
+        msg['To'] = '%20d' % i
+        x.append(msg)

Modified: pypy/build/benchmem/benchmark/sizes.py
==============================================================================
--- pypy/build/benchmem/benchmark/sizes.py	(original)
+++ pypy/build/benchmem/benchmark/sizes.py	Thu Nov  6 23:45:17 2008
@@ -372,20 +372,4 @@
         x = (x,)
     checkpoint(collect=True)
 
-# ____________________________________________________________
 
-import sys,new
-sys.modules['socket'] = new.module("socket")
-from email.Message import Message
-
-def bench_list_of_messages(iter1):
-    x = []
-    for i in range(iter1/10):
-        # make block-looking 40-lines, 72-columns e-mails
-        msg = Message()
-        msg.set_payload(('%072d' % i) * 40)
-        msg['Subject'] = '%60d' % i
-        msg['From'] = '%15d' % i
-        msg['To'] = '%20d' % i
-        x.append(msg)
-    checkpoint(collect=True)