commit 0fc1367cd3907605d05b7d56d04887b69635111c
author Ved-vampir <akiselyova@mirantis.com> Wed Mar 18 11:13:17 2015 +0300
committer Ved-vampir <akiselyova@mirantis.com> Wed Mar 18 11:13:35 2015 +0300
tree 1efe19face0c6155df77b45dae023d8ce20a0203
parent bf83ad9614b76265d1dae58868973bc0c1116579

percent removed, name changed

sensors/pscpu_sensors.py

diff --git a/sensors/pscpu_sensors.py b/sensors/pscpu_sensors.py
index 4e1849f..24f252b 100644
--- a/sensors/pscpu_sensors.py
+++ b/sensors/pscpu_sensors.py
@@ -1,5 +1,4 @@
 import os
-import time
 
 from discover import provides
 from utils import SensorInfo, get_pid_name, get_pid_list
@@ -9,30 +8,16 @@
 @provides("perprocess-cpu")
 def pscpu_stat(disallowed_prefixes=None, allowed_prefixes=None):
     results = {}
-    pid_stat0 = {}
-    sys_stat0 = {}
     pid_list = get_pid_list(disallowed_prefixes, allowed_prefixes)
 
     for pid in pid_list:
         try:
-            pid_stat0[pid] = pid_stat(pid)
-            sys_stat0[pid] = sys_stat()
-        except IOError:
-            # may be, proc has already terminated
-            continue
-
-    time.sleep(1)
-
-    for pid in pid_list:
-        try:
             dev_name = get_pid_name(pid)
 
             pid_stat1 = pid_stat(pid)
-            sys_stat1 = sys_stat()
-            cpu = (pid_stat1 - pid_stat0[pid]) / (sys_stat1 - sys_stat0[pid])
 
             sensor_name = "{0}.{1}".format(dev_name, pid)
-            results[sensor_name] = SensorInfo(cpu*100, False)
+            results[sensor_name] = SensorInfo(pid_stat1, False)
         except IOError:
             # may be, proc has already terminated
             continue
@@ -44,21 +29,10 @@
     # read /proc/pid/stat
     with open(os.path.join('/proc/', pid, 'stat'), 'r') as pidfile:
         proctimes = pidfile.readline().split()
-        # get utime from /proc/<pid>/stat, 14 item
-        utime = proctimes[13]
-        # get stime from proc/<pid>/stat, 15 item
-        stime = proctimes[14]
-        # count total process used time
-        proctotal = int(utime) + int(stime)
-        return float(proctotal)
-
-
-def sys_stat():
-    """ Return total system cpu usage time"""
-    with open('/proc/stat', 'r') as procfile:
-        cputimes = procfile.readline().split()[1:]
-        cputotal = 0
-        # count from /proc/stat sum
-        for i in cputimes:
-            cputotal = cputotal + int(i)
-        return float(cputotal)
+    # get utime from /proc/<pid>/stat, 14 item
+    utime = proctimes[13]
+    # get stime from proc/<pid>/stat, 15 item
+    stime = proctimes[14]
+    # count total process used time
+    proctotal = int(utime) + int(stime)
+    return float(proctotal)

sensors/utils.py

diff --git a/sensors/utils.py b/sensors/utils.py
index 546dee7..fee0198 100644
--- a/sensors/utils.py
+++ b/sensors/utils.py
@@ -50,7 +50,7 @@
                 return os.path.basename(cmd).rstrip('\x00')
             except IndexError:
                 # no cmd returned
-                return "no_name"
+                return "<NO NAME>"
     except IOError:
         return "no_such_process"