Merge pull request #24 from SteveGuo/master

fixed the bug#23

Author: fossfreedom

README.md

@@ -11,9 +11,12 @@ https://launchpad.net/indicator-sysmonitor
 
 Current fork maintainer: fossfreedom <[email protected]>
 
+v0.6.3: SteveGuo <[email protected]>
+https://github.com/SteveGuo
+
 ----
 
-Installation - v0.6.2 stable
+Installation - v0.6.3 stable
 
 on Ubuntu and derivatives - manual installation
 
@@ -39,6 +42,7 @@ To install via PPA:
 
 Changelog
 
+ - v0.6.3 - fixed the bug when display multiple CPU cores it always display the later ones as 0%
  - v0.6.2 - bug fix to stop crash for custom sensors
  - v0.6.1 - fix the debian packaging
  - v0.6 - stable release - reworked to be easier to maintain

preferences.py

@@ -21,7 +21,7 @@
 from sensors import ISMError
 
 
-VERSION = '0.6.2~stable'
+VERSION = '0.6.3~stable'
 
 
 def raise_dialog(parent, flags, type_, buttons, msg, title):

sensors.py

@@ -25,6 +25,7 @@
 
 
 B_UNITS = ['', 'KB', 'MB', 'GB', 'TB']
+cpu_load = []
 
 def bytes_to_human(bytes_):
     unit = 0
@@ -75,8 +76,6 @@ def __init__(self):
                 self.settings['sensors'][sensor.name] = (sensor.desc, sensor.cmd)
 
             #self.update_regex()
-
-            self.last = ps.cpu_times()
             self._last_net_usage = [0, 0]  # (up, down)
 
         #@staticmethod
@@ -255,11 +254,18 @@ def get_results(self):
             res = {}
             from preferences import Preferences
 
+            global cpu_load
+            cpu_checked = False
+            cpus = re.compile("\Acpu\d*\Z")
+
             #print (self.settings["custom_text"]) custom_text is the full visible string seen in Preferences edit field
             for sensor in Preferences.sensors_regex.findall(
                     self.settings["custom_text"]):
 
                 sensor = sensor[1:-1]
+                if cpus.match(sensor) and cpu_checked == False:
+                    cpu_load = ps.cpu_percent(interval = 0, percpu = True) # We call this only once per update
+                    cpu_checked = True
 
                 instance = self.get(sensor)
 
@@ -354,31 +360,15 @@ def get_value(self, sensor):
 
     def _fetch_cpu(self, percpu=False):
         if percpu:
-            return ps.cpu_percent(interval=0, percpu=True)
-
-        last = self.last
-        current = ps.cpu_times()
-        if not last:
-            last = current
-
-        total_time_passed = sum(
-            [v - last.__dict__[k]
-             if not isinstance(v, list)
-             else 0
-             for k, v in current.__dict__.items()])
-
-        sys_time = current.system - last.system
-        usr_time = current.user - last.user
+            return cpu_load
 
-        self.last = current
+        r = 0.0;
+        for i in cpu_load:
+            r += i
 
-        if total_time_passed > 0:
-            sys_percent = 100 * sys_time / total_time_passed
-            usr_percent = 100 * usr_time / total_time_passed
-            return sys_percent + usr_percent
-        else:
-            return 0
+        r /= ps.NUM_CPUS
 
+        return r
 
 class MemSensor(BaseSensor):
     name = 'mem'
@@ -547,4 +537,4 @@ def run(self):
         while self._parent.alive.isSet():
             data = self.fetch()
             self._parent.update(data)
-            time.sleep(self.mgr.get_interval())
+            time.sleep(self.mgr.get_interval())