[svn] r5293 - trunk/tools/dstat

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-04-18 15:48:27 +0200 (Wed, 18 Apr 2007)
New Revision: 5293

Modified:
   trunk/tools/dstat/ChangeLog
   trunk/tools/dstat/dstat
   trunk/tools/dstat/dstat15
Log:
Removed SwapCached from the Cached counter. (Peter Rabbitson)

Modified: trunk/tools/dstat/ChangeLog
===================================================================
--- trunk/tools/dstat/ChangeLog	2007-04-18 13:18:07 UTC (rev 5292)
+++ trunk/tools/dstat/ChangeLog	2007-04-18 13:48:27 UTC (rev 5293)
@@ -1,3 +1,6 @@
+* 0.6.6 - ... - released 18/04/2007
+- Removed SwapCached from the Cached counter. (Peter Rabbitson)
+
 * 0.6.5 - Torrox - released 17/04/2007
 - Added VMware ESX plugins (Bert de Bruijn)
 - Added tcp6 and udp6 statistics within dstat_tcp and dstat_udp

Modified: trunk/tools/dstat/dstat
===================================================================
--- trunk/tools/dstat/dstat	2007-04-18 13:18:07 UTC (rev 5292)
+++ trunk/tools/dstat/dstat	2007-04-18 13:48:27 UTC (rev 5293)
@@ -987,9 +987,8 @@
 			l = line.split()
 			if len(l) < 2: continue
 			name = l[0].split(':')[0]
-			if name in self.vars + ('MemTotal', 'SwapCached'):
+			if name in self.vars + ('MemTotal', ):
 				self.val[name] = long(l[1]) * 1024.0
-		self.val['Cached'] = self.val['Cached'] + self.val['SwapCached']
 		self.val['MemUsed'] = self.val['MemTotal'] - self.val['MemFree'] - self.val['Buffers'] - self.val['Cached']
 
 class dstat_net(dstat):

Modified: trunk/tools/dstat/dstat15
===================================================================
--- trunk/tools/dstat/dstat15	2007-04-18 13:18:07 UTC (rev 5292)
+++ trunk/tools/dstat/dstat15	2007-04-18 13:48:27 UTC (rev 5293)
@@ -985,9 +985,8 @@
 			l = string.split(line)
 			if len(l) < 2: continue
 			name = string.split(l[0], ':')[0]
-			if name in self.vars + ('MemTotal', 'SwapCached'):
+			if name in self.vars + ('MemTotal', ):
 				self.val[name] = long(l[1]) * 1024.0
-		self.val['Cached'] = self.val['Cached'] + self.val['SwapCached']
 		self.val['MemUsed'] = self.val['MemTotal'] - self.val['MemFree'] - self.val['Buffers'] - self.val['Cached']
 
 class dstat_net(dstat):