[svn] r5602 - trunk/tools/dstat/plugins

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-07-11 22:59:24 +0200 (Wed, 11 Jul 2007)
New Revision: 5602

Modified:
   trunk/tools/dstat/plugins/dstat_topcpu.py
   trunk/tools/dstat/plugins/dstat_topmem.py
Log:
Make topcpu and topmem less wide.

Modified: trunk/tools/dstat/plugins/dstat_topcpu.py
===================================================================
--- trunk/tools/dstat/plugins/dstat_topcpu.py	2007-07-11 11:16:52 UTC (rev 5601)
+++ trunk/tools/dstat/plugins/dstat_topcpu.py	2007-07-11 20:59:24 UTC (rev 5602)
@@ -9,7 +9,7 @@
 class dstat_topcpu(dstat):
     def __init__(self):
         self.name = 'most expensive'
-        self.format = ('s', 18, 34)
+        self.format = ('s', 16, 34)
         self.nick = ('cpu process',)
         self.vars = self.nick
         self.pid = str(os.getpid())
@@ -28,6 +28,7 @@
                 ### Using dopen() will cause too many open files
 #               l = string.split(dopen('/proc/%s/stat' % pid).read())
                 l = string.split(open('/proc/%s/stat' % pid).read())
+
                 if len(l) < 15: continue
                 self.cn2[pid] = int(l[13]) + int(l[14])
                 usage = (self.cn2[pid] - self.cn1[pid]) * 1.0 / tick
@@ -37,6 +38,15 @@
                     self.val['usage'] = usage
                     self.val['name'] = l[1][1:-1]
                     self.val['pid'] = pid
+                    st = os.stat("/proc/%s" % pid)
+#                    if st:
+#                        pw = pwd.getpwuid(st.st_uid)
+#                        if pw:
+#                            self.val['user'] = pw[0]
+#                        else:
+#                            self.val['user'] = stat.st_uid
+#                    else:
+#                        self.val['user'] = 'none'
 
         if self.val['usage'] == 0.0:
             self.val['process'] = ''

Modified: trunk/tools/dstat/plugins/dstat_topmem.py
===================================================================
--- trunk/tools/dstat/plugins/dstat_topmem.py	2007-07-11 11:16:52 UTC (rev 5601)
+++ trunk/tools/dstat/plugins/dstat_topmem.py	2007-07-11 20:59:24 UTC (rev 5602)
@@ -9,7 +9,7 @@
 class dstat_topmem(dstat):
     def __init__(self):
         self.name = 'most expensive'
-        self.format = ('s', 18, 0)
+        self.format = ('s', 16, 0)
         self.nick = ('memory process',)
         self.vars = self.nick
         self.pid = str(os.getpid())