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

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-12-05 19:35:37 +0100 (Wed, 05 Dec 2007)
New Revision: 6035

Modified:
   trunk/tools/dstat/docs/dstat-paper.txt
   trunk/tools/dstat/plugins/dstat_cpufreq.py
Log:
Fix for cpufreq scaling and docs.

Modified: trunk/tools/dstat/docs/dstat-paper.txt
===================================================================
--- trunk/tools/dstat/docs/dstat-paper.txt	2007-12-05 11:33:16 UTC (rev 6034)
+++ trunk/tools/dstat/docs/dstat-paper.txt	2007-12-05 18:35:37 UTC (rev 6035)
@@ -234,7 +234,7 @@
     - topmem: most expensive memory process
     - utmp: utmp counters
     - vmkhba: VMware kernel HBA counters
-    - vmkint: VMWare kernel interrupt counters
+    - vmkint: VMware kernel interrupt counters
     - vzcpu: OpenVZ CPU counters
     - vzubc: OpenVZ user beancounters
     - wifi: WIFI quality information
@@ -383,7 +383,7 @@
 
 === What process is using all my CPU or memory at 4:20 AM ?
 Imagine the monitoring team notices strange peaks, a system engineer got a
-worthless message, the system was swaping extensively, a process got killed.
+worthless message, the system was swapping extensively, a process got killed.
 
 Something indicates the system is doing something unexpected but what is
 causing it and why ? As of now you can do:

Modified: trunk/tools/dstat/plugins/dstat_cpufreq.py
===================================================================
--- trunk/tools/dstat/plugins/dstat_cpufreq.py	2007-12-05 11:33:16 UTC (rev 6034)
+++ trunk/tools/dstat/plugins/dstat_cpufreq.py	2007-12-05 18:35:37 UTC (rev 6035)
@@ -20,21 +20,21 @@
     def check(self): 
         if self.vars:
             for cpu in self.vars:
-                if not os.access('/sys/devices/system/cpu/'+cpu+'/cpufreq/cpuinfo_cur_freq', os.R_OK):
+                if not os.access('/sys/devices/system/cpu/'+cpu+'/cpufreq/scaling_cur_freq', os.R_OK):
                     raise Exception, 'Cannot access acpi cpu frequency information'
             return True
         raise Exception, 'No statistics found'
 
     def extract(self):
         for cpu in self.vars:
-            for line in dopen('/sys/devices/system/cpu/'+cpu+'/cpufreq/cpuinfo_max_freq').readlines():
+            for line in dopen('/sys/devices/system/cpu/'+cpu+'/cpufreq/scaling_max_freq').readlines():
                 l = string.split(line)
                 max = int(l[0])
-            for line in dopen('/sys/devices/system/cpu/'+cpu+'/cpufreq/cpuinfo_cur_freq').readlines():
+            for line in dopen('/sys/devices/system/cpu/'+cpu+'/cpufreq/scaling_cur_freq').readlines():
                 l = string.split(line)
                 cur = int(l[0])
             ### Need to close because of bug in sysfs (?)
-            dclose('/sys/devices/system/cpu/'+cpu+'/cpufreq/cpuinfo_cur_freq')
+            dclose('/sys/devices/system/cpu/'+cpu+'/cpufreq/scaling_cur_freq')
             self.val[cpu] = cur * 100.0 / max
 
 # vim:ts=4:sw=4:et