pass-N messages: print also data+stack consumption from /proc/self/statm

* util.cxx (getmemusage): Extract all other fields from /proc/self/statm.
  Toss most of them away.  Print #6 also.

diff --git a/util.cxx b/util.cxx
index 08755a2b061f781114ebeef3419baeadd90fbbee..9b49445e535ca2a362b02801d3102c2a3eb6797e 100644 (file)
--- a/util.cxx
+++ b/util.cxx
@@ -283,12 +283,24 @@ getmemusage ()
   ostringstream oss;
   ifstream statm("/proc/self/statm");
   statm >> pages;
-  long kb1 = pages * sz / 1024;
+  long kb1 = pages * sz / 1024; // total program size; vmsize
   statm >> pages;
-  long kb2 = pages * sz / 1024;
+  long kb2 = pages * sz / 1024; // resident set size; vmrss
   statm >> pages;
-  long kb3 = pages * sz / 1024;
-  oss << _F("using %ldvirt/%ldres/%ldshr kb, ", kb1, kb2, kb3);
+  long kb3 = pages * sz / 1024; // shared pages
+  statm >> pages;
+  long kb4 = pages * sz / 1024; // text
+  statm >> pages;
+  (void) kb4;
+  long kb5 = pages * sz / 1024; // library
+  statm >> pages;
+  (void) kb5;
+  long kb6 = pages * sz / 1024; // data+stack
+  statm >> pages;
+  long kb7 = pages * sz / 1024; // dirty
+  (void) kb7;
+
+  oss << _F("using %ldvirt/%ldres/%ldshr/%lddata kb, ", kb1, kb2, kb3, kb6);
   return oss.str();
 }