[or-cvs] r22477: {arm} fix - failing to cache ps results for the system resource gr (in arm/trunk: . interface)

[Damian Johnson <atagar1@xxxxxxxxx>]

Author: atagar
Date: 2010-06-06 02:38:34 +0000 (Sun, 06 Jun 2010)
New Revision: 22477

Modified:
   arm/trunk/TODO
   arm/trunk/interface/cpuMemMonitor.py
Log:
fix - failing to cache ps results for the system resource graph



Modified: arm/trunk/TODO
===================================================================
--- arm/trunk/TODO	2010-06-06 02:15:01 UTC (rev 22476)
+++ arm/trunk/TODO	2010-06-06 02:38:34 UTC (rev 22477)
@@ -108,8 +108,6 @@
         My version still isn't handling all inputs anyway (still need to handle
         masks, private keyword, and prepended policy). Parse it from the rest
         of the router if too heavy ("TorCtl.Router.will_exit_to instead").
-    * prevent connection lookups when tor is shut down (currently presents
-        failover messages)
     * avoid hostname lookups of private connections
         Stripped most of them but suspect there might be others (have assertions
         check for this in a debug mode?)

Modified: arm/trunk/interface/cpuMemMonitor.py
===================================================================
--- arm/trunk/interface/cpuMemMonitor.py	2010-06-06 02:15:01 UTC (rev 22476)
+++ arm/trunk/interface/cpuMemMonitor.py	2010-06-06 02:38:34 UTC (rev 22477)
@@ -37,7 +37,7 @@
     sampling = []
     psCall = None
     if torPid:
-      psCall = sysTools.call("ps -p %s -o %s" % (torPid, "%cpu,rss"), 5, True)
+      psCall = sysTools.call("ps -p %s -o %s" % (torPid, "%cpu,rss,%mem,etime"), 5, True)
     if psCall and len(psCall) >= 2: sampling = psCall[1].strip().split()
     
     if len(sampling) < 2: