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

[xoraxax at codespeak.net]

Author: xoraxax
Date: Sun Nov  2 13:33:52 2008
New Revision: 59651

Modified:
   pypy/build/benchmem/report.py
   pypy/build/benchmem/report_graphic.py
Log:
Revert back to process private memory again and fix the API again.

Modified: pypy/build/benchmem/report.py
==============================================================================
--- pypy/build/benchmem/report.py	(original)
+++ pypy/build/benchmem/report.py	Sun Nov  2 13:33:52 2008
@@ -229,7 +229,7 @@
                             filter(group=self.HEAP, inv=True).private for result in
                             results])
         plotter.plot_baseint_sizes(heap_private, ip_code, ip_data, rest, [r.executable for r in results])
-        return dict([(r.executable, r.snapshot.heap_private()) for r in results])
+        return dict([(r.executable, r.snapshot) for r in results])
 
 
 class BaseTimeOfInterpreters:
@@ -283,8 +283,8 @@
         plotter = Plotter(options.basepath, options.show)
         #plotter = Plotter(None, True)
         IncrementalSizePerBench(resultset).run_graphic(plotter)
-        totals = BaseSizeOfInterpreters(resultset).run_graphic(plotter)
-        AppProfiles(resultset).run_graphic(plotter, totals)
+        snapshots = BaseSizeOfInterpreters(resultset).run_graphic(plotter)
+        AppProfiles(resultset).run_graphic(plotter, snapshots)
     
     #for name, results in reader.name2results.items():
     #    tw.sep("=", name)

Modified: pypy/build/benchmem/report_graphic.py
==============================================================================
--- pypy/build/benchmem/report_graphic.py	(original)
+++ pypy/build/benchmem/report_graphic.py	Sun Nov  2 13:33:52 2008
@@ -102,11 +102,12 @@
                 else:
                     x = [(val - min_ts)/d_ts*100 for val in timestamps]
                 if base_snapshots:
-                    basesize = base_snapshots[result.executable].heap_private()
+                    basesize = base_snapshots[result.executable].private
                 else:
                     basesize = 0
-                y = [snapshot.heap_private() - basesize
-                        # we do not measure the dirty static data here which is probably sane
+                # XXX we also measure the working set of the data segment or
+                # third party libraries here
+                y = [snapshot.private - basesize
                      for snapshot in result.snapshots]
                 pylab.title(name)
                 plots.append(pylab.plot(x, y))
@@ -114,7 +115,7 @@
             pylab.legend(plots, [result.executable for result in results])
             xlabel = ["wall clock time (%)", "wall clock time (s)"][SHOW_TS]
             pylab.xlabel(xlabel)
-            ylabel = ["", "incremental "][bool(basesize)] + "heap memory consumption (kB)"
+            ylabel = ["", "incremental "][bool(basesize)] + "private memory consumption (kB)"
             pylab.ylabel(ylabel)
             if self.basepath is not None:
                 pylab.savefig(self.basepath + 'appprofiles_%s.ps' % name)