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

[fijal at codespeak.net]

Author: fijal
Date: Mon Sep 22 22:16:49 2008
New Revision: 58348

Modified:
   pypy/build/benchmem/report.py
   pypy/build/benchmem/runbench.py
Log:
Use private instead of private dirty. Most of the time this stays the same,
but in case something get swapped out, we really want to measure total
memory.


Modified: pypy/build/benchmem/report.py
==============================================================================
--- pypy/build/benchmem/report.py	(original)
+++ pypy/build/benchmem/report.py	Mon Sep 22 22:16:49 2008
@@ -29,11 +29,11 @@
 
     for name, results in reader.name2results.items():
         tw.sep("=", name)
-        row0 = "executable maxpdirty maxrss".split()
+        row0 = "executable maxprivate maxrss".split()
         rows = [row0]
         for result in results:
             rows.append([result.executable,
-                         result.max("private_dirty"),
+                         result.max("private"),
                          result.max("rss"),
                         ])
         tw.line(asciitable(rows))
@@ -49,7 +49,7 @@
         for i in range(numsnapshosts):
             row = [i]
             for result in results:
-                row.append(result.snapshots[i].private_dirty)
+                row.append(result.snapshots[i].private)
             rows.append(row)
         tw.line(asciitable(rows))
         

Modified: pypy/build/benchmem/runbench.py
==============================================================================
--- pypy/build/benchmem/runbench.py	(original)
+++ pypy/build/benchmem/runbench.py	Mon Sep 22 22:16:49 2008
@@ -168,9 +168,11 @@
         self.mappings = mappings
         for name in smaps.Mapping._attrnames:
             setattr(self, name, sum([getattr(x, name) for x in mappings]))
+        self.private = self.private_dirty + self.private_clean
+        self.shared = self.shared_dirty + self.shared_clean
 
     def memusage(self):
-        return "privdirty: %d, shadirty: %d" %(self.private_dirty, self.shared_dirty)
+        return "private: %d, shared: %d" %(self.private, self.shared)
 
 #
 # ==============================================================================