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

[fijal at codespeak.net]

Author: fijal
Date: Mon Nov  3 17:37:35 2008
New Revision: 59689

Modified:
   pypy/build/benchmem/report.py
   pypy/build/benchmem/report_graphic.py
Log:
save png by default


Modified: pypy/build/benchmem/report.py
==============================================================================
--- pypy/build/benchmem/report.py	(original)
+++ pypy/build/benchmem/report.py	Mon Nov  3 17:37:35 2008
@@ -283,7 +283,6 @@
     if options.basepath or options.show:
         from report_graphic import Plotter
         plotter = Plotter(options.basepath, options.show)
-        #plotter = Plotter(None, True)
         IncrementalSizePerBench(resultset).run_graphic(plotter)
         snapshots = BaseSizeOfInterpreters(resultset).run_graphic(plotter)
         AppProfiles(resultset).run_graphic(plotter, snapshots)

Modified: pypy/build/benchmem/report_graphic.py
==============================================================================
--- pypy/build/benchmem/report_graphic.py	(original)
+++ pypy/build/benchmem/report_graphic.py	Mon Nov  3 17:37:35 2008
@@ -8,15 +8,10 @@
 import py
 import pylab
 import numpy
-
-import smaps, runbench
-
-
-HEAP = runbench.Mappings.HEAP
-CODE = runbench.Mappings.CODE
-DATA = runbench.Mappings.DATA
 SPLIT = 10
 
+EXT = ".png"
+
 class Plotter(object):
     def __init__(self, basepath='', show=False):
         self.basepath = basepath
@@ -42,7 +37,7 @@
                ['heap private', 'ip code', 'ip data', 'rest'])
         pylab.ylabel('memory consumption (kB)')
         if self.basepath is not None:
-            pylab.savefig(self.basepath + "base_size.ps")
+            pylab.savefig(self.basepath + "base_size" + EXT)
         if self.show:
             pylab.show()
 
@@ -80,7 +75,7 @@
                                                 range(start, end)])
             pylab.ylabel("memory consumption (kB)")
             if self.basepath is not None:
-                pylab.savefig(self.basepath + "objsizes_%d.ps" % view)
+                pylab.savefig(self.basepath + "objsizes_%d%s" % (view, EXT))
             if self.show:
                 pylab.show()
 
@@ -109,8 +104,8 @@
                 # third party libraries here
                 y = [snapshot.private - basesize
                      for snapshot in result.snapshots]
-                pylab.title(name)
                 plots.append(pylab.plot(x, y))
+            pylab.title(name)
 
             pylab.legend(plots, [result.executable_short for result in results])
             xlabel = ["wall clock time (%)", "wall clock time (s)"][SHOW_TS]
@@ -118,7 +113,7 @@
             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)
+                pylab.savefig(self.basepath + 'appprofiles_%s%s' % (name, EXT))
             if self.show:
                 pylab.show()