[svn] r6270 - trunk/tools/dstat

[packagers at lists.rpmforge.net]

Author: dag
Date: 2008-04-17 18:53:10 +0100 (Thu, 17 Apr 2008)
New Revision: 6270

Modified:
   trunk/tools/dstat/ChangeLog
   trunk/tools/dstat/dstat
Log:
Added external dstat_net_packets plugin to show the number of packets per interface

Modified: trunk/tools/dstat/ChangeLog
===================================================================
--- trunk/tools/dstat/ChangeLog	2008-04-17 17:41:33 UTC (rev 6269)
+++ trunk/tools/dstat/ChangeLog	2008-04-17 17:53:10 UTC (rev 6270)
@@ -1,4 +1,4 @@
-* 0.6.7svn - ... - release 22/03/2008
+* 0.6.7svn - ... - release 17/04/2008
 - Added improved tick patch (Kelly Long)
 - Show milliseconds in dstat_time when using --debug cfr. dstat_epoch
 - Difference in integer rounding should not affect colouring
@@ -14,6 +14,7 @@
 - Fixed exception when specifying -I eth0 (Radek Brich)
 - dstat_int plugin now allows -I total (Radek Brich)
 - Fixed typo in dstat_topio and dstat_topbio when using CSV output (Bharvani Toshaan)
+- Added external dstat_net_packets plugin to show the number of packets per interface
 
 * 0.6.7 - Cambridge overdue - released 26/02/2008
 - Only rewrite xterm title when XTERM_SHELL is set to bash

Modified: trunk/tools/dstat/dstat
===================================================================
--- trunk/tools/dstat/dstat	2008-04-17 17:41:33 UTC (rev 6269)
+++ trunk/tools/dstat/dstat	2008-04-17 17:53:10 UTC (rev 6270)
@@ -106,7 +106,7 @@
             import getopt
             opts, args = getopt.getopt (args, 'acdfghilmno:pstTvyC:D:I:M:N:S:V',
                 ['cpu', 'disk', 'epoch', 'int', 'ipc', 'load', 'lock', 'mem', 'net',
-                'page', 'proc', 'raw', 'swap', 'sys', 'tcp', 'time', 'udp', 'unix', 
+                'page', 'proc', 'raw', 'swap', 'sys', 'tcp', 'time', 'udp', 'unix',
                 'all', 'debug', 'full', 'help', 'integer', 'mods', 'modules', 'nocolor',
                 'noheaders', 'noupdate', 'output=', 'pidfile=', 'version', 'vmstat'])
         except getopt.error, exc:
@@ -341,7 +341,7 @@
         for i, name in enumerate(self.name):
             max = self.width()
             ret = ret + name[0:max].center(max).replace(' ', '-')
-            if i + 1 != len(self.name): 
+            if i + 1 != len(self.name):
                 if op.color:
                     ret = ret + ansi['blue'] + char['dash'] + ansi['darkblue']
                 else:
@@ -639,7 +639,7 @@
                         if re.match('^'+disk+'$', name):
                             self.cn2[set] = ( self.cn2[set][0] + long(l[5]), self.cn2[set][1] + long(l[9]) )
         for name in self.cn2.keys():
-            self.val[name] = ( 
+            self.val[name] = (
                 (self.cn2[name][0] - self.cn1[name][0]) * 512.0 / tick,
                 (self.cn2[name][1] - self.cn1[name][1]) * 512.0 / tick,
             )
@@ -702,7 +702,7 @@
                         if re.match('^'+disk+'$', name):
                             self.cn2[set] = ( self.cn2[set][0] + long(l[6]), self.cn2[set][1] + long(l[10]) )
         for name in self.cn2.keys():
-            self.val[name] = ( 
+            self.val[name] = (
                 (self.cn2[name][0] - self.cn1[name][0]) * 512.0 / tick,
                 (self.cn2[name][1] - self.cn1[name][1]) * 512.0 / tick,
             )
@@ -1074,7 +1074,7 @@
                 self.cn2['total'] = ( self.cn2['total'][0] + long(l[1]), self.cn2['total'][1] + long(l[9]))
         if update:
             for name in self.cn2.keys():
-                self.val[name] = ( 
+                self.val[name] = (
                     (self.cn2[name][0] - self.cn1[name][0]) * 1.0 / tick,
                     (self.cn2[name][1] - self.cn1[name][1]) * 1.0 / tick,
                  )