[svn] r5603 - in trunk/tools/dstat: . docs plugins

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-07-11 23:09:18 +0200 (Wed, 11 Jul 2007)
New Revision: 5603

Modified:
   trunk/tools/dstat/ChangeLog
   trunk/tools/dstat/docs/dstat.1.txt
   trunk/tools/dstat/plugins/dstat_topcpu.py
   trunk/tools/dstat/plugins/dstat_topmem.py
Log:
Fixed a problem with asciidoc DocBook output (Dbt 427214, Michael Ablassmeier)

Modified: trunk/tools/dstat/ChangeLog
===================================================================
--- trunk/tools/dstat/ChangeLog	2007-07-11 20:59:24 UTC (rev 5602)
+++ trunk/tools/dstat/ChangeLog	2007-07-11 21:09:18 UTC (rev 5603)
@@ -4,7 +4,8 @@
 - Use sys.exit() instead of exit() before color support is detected
 - Renamed external dstat_app plugin to dstat_topcpu
 - Added external dstat_topmem plugin
-- Improved dstat_topcpu CSV output 
+- Improved dstat_topcpu CSV output
+- Fixed a problem with asciidoc DocBook output (Dbt 427214, Michael Ablassmeier)
 
 * 0.6.6 - Unemployed - released 28/04/2007
 - Removed SwapCached from the Cached counter (Dbt 418326, Peter Rabbitson)

Modified: trunk/tools/dstat/docs/dstat.1.txt
===================================================================
--- trunk/tools/dstat/docs/dstat.1.txt	2007-07-11 20:59:24 UTC (rev 5602)
+++ trunk/tools/dstat/docs/dstat.1.txt	2007-07-11 21:09:18 UTC (rev 5603)
@@ -172,20 +172,20 @@
 
 USAGE
 -----
-Using dstat to relate disk-throughput with network-usage (eth0), total CPU-usage and system counters:::
-.....
+Using dstat to relate disk-throughput with network-usage (eth0), total CPU-usage and system counters:
+----
 dstat -dnyc -n eth0 -C total -f 5
-.....
+----
 
-Checking dstat's behaviour and the system's impact on dstat:::
-.....
+Checking dstat's behaviour and the system's impact on dstat:
+----
 dstat -taf --debug
-.....
+----
 
-Using the external clock and app plugins together with normal system resources:::
-....
+Using the external clock and app plugins together with normal system resources:
+----
 dstat -M clock,app -cndylp
-....
+----
 
 
 BUGS

Modified: trunk/tools/dstat/plugins/dstat_topcpu.py
===================================================================
--- trunk/tools/dstat/plugins/dstat_topcpu.py	2007-07-11 20:59:24 UTC (rev 5602)
+++ trunk/tools/dstat/plugins/dstat_topcpu.py	2007-07-11 21:09:18 UTC (rev 5603)
@@ -78,7 +78,8 @@
         if self.val['usage'] == 0.0:
             return '%-*s' % (self.format[1], '')
         else:
-            return '%s%-*s%s%3d' % (ansi['default'], self.format[1]-3, self.val['process'], ansi['yellow'], round(self.val['usage']))
+            return '%s%-*s%s' % (ansi['default'], self.format[1]-3, self.val['process'], cprint(self.val['usage'], ('p', 3, 34)))
+#ansi['yellow'], round(self.val['usage']))
 
     def showcsv(self):
         return '%s / %d%%' % (self.val['name'], self.val['usage'])

Modified: trunk/tools/dstat/plugins/dstat_topmem.py
===================================================================
--- trunk/tools/dstat/plugins/dstat_topmem.py	2007-07-11 20:59:24 UTC (rev 5602)
+++ trunk/tools/dstat/plugins/dstat_topmem.py	2007-07-11 21:09:18 UTC (rev 5603)
@@ -59,7 +59,7 @@
 #           self.val['process'] = '%*s %-*s' % (5, self.val['pid'], self.format[1]-6, self.val['name'])
 
     def show(self):
-        return '%s%-*s%s%s' % (ansi['default'], self.format[1]-4, self.val['process'], ansi['yellow'], cprint(self.val['usage']))
+        return '%s%-*s%s' % (ansi['default'], self.format[1]-4, self.val['process'], cprint(self.val['usage'], ('f', 4, 1024)))
 
     def showcsv(self):
         return '%s / %d%%' % (self.val['name'], self.val['usage'])