[pypy-svn] r59604 - pypy/build/benchmem

[xoraxax at codespeak.net]

Author: xoraxax
Date: Fri Oct 31 19:36:18 2008
New Revision: 59604

Modified:
   pypy/build/benchmem/report_graphic.py
Log:
Revert last checkin on graph reporter to ease merging.

Modified: pypy/build/benchmem/report_graphic.py
==============================================================================
--- pypy/build/benchmem/report_graphic.py	(original)
+++ pypy/build/benchmem/report_graphic.py	Fri Oct 31 19:36:18 2008
@@ -22,8 +22,7 @@
     * ip data
     * private rest
     """
-    if not results:
-        return
+    
     heap_private = numpy.array([result.snapshot.filter(group=HEAP).private
                     for result in results])
     ip_code = numpy.array([result.snapshot.filter(group=result.executable,
@@ -65,8 +64,7 @@
     private memory consumed for object allocation (without base interpreter
     size)
     """
-    if not resultset.results:
-        return
+    
     def incremental_private(result):
         return (result.snapshots[1].heap_private() -
                 result.snapshots[0].heap_private())
@@ -120,31 +118,17 @@
     pylab.clf()
     for name, results in resultset.filter(benchtype="appprofiles").getname2results():
         plots = []
-        USE_TS = True
         for result in results:
-            if not USE_TS:
-                lgt = len(result.snapshots)
-                x = [(float(i)/lgt)*100 for i in range(lgt)]
-            else:
-                x = [float(ss.header['TS']) for ss in result.snapshots]
-                min_ts = min(x)
-                x = [val - min_ts for val in x]
-            if totals:
-                basesize = totals[result.executable]
-            else:
-                basesize = 0
-            # XXX measures also the used code pages, this is bad because we do not want to
-            # mix effects because of code generation and GC behaviour
-            y = [snapshot.private - basesize
+            lgt = len(result.snapshots)
+            x = [(float(i)/lgt)*100 for i in range(lgt)]
+            y = [snapshot.private - totals[result.executable]
                  for snapshot in result.snapshots]
             pylab.title(name)
             plots.append(pylab.plot(x, y))
 
         pylab.legend(plots, [result.executable for result in results])
-        xlabel = ["time (%)", "wall clock time (s)"][USE_TS]
-        pylab.xlabel(xlabel)
-        ylabel = ["", "incremental "][bool(basesize)] + "private memory consumption"
-        pylab.ylabel(ylabel)
+        pylab.xlabel("time (%)")
+        pylab.ylabel("incremental private memory consumption")
         pylab.savefig(BASE + 'appprofiles_%s.ps' % name)
         if SHOW:
             pylab.show()