#792 / cpu_stats() / linux: add soft_interrupts

giampaolo · Mar 5, 2016 · d4817f2 · d4817f2
1 parent 31808c0
commit d4817f2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 24 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -155,33 +155,33 @@ CPU
   Return various CPU statistics as a namedtuple whose fields change depending
   on the platform.
 
-     +---------------+--------------+--------------+--------------+------------+-------------+--------------+
-     | Linux         |  OSX         | Windows      | SunOS        | FreeBSD    | OpenBSD     | NetBSD       |
-     +===============+==============+==============+==============+============+=============+==============+
-     | ctx_switches  |              |              |              |            |             |              |
-     +---------------+--------------+--------------+--------------+------------+-------------+--------------+
-     | interrupts    |              |              |              |            |             |              |
-     +---------------+--------------+--------------+--------------+------------+-------------+--------------+
-     | procs_running |              |              |              |            |             |              |
-     +---------------+--------------+--------------+--------------+------------+-------------+--------------+
-     | procs_blocked |              |              |              |            |             |              |
-     +---------------+--------------+--------------+--------------+------------+-------------+--------------+
-     |               |              |              |              |            |             |              |
-     +---------------+--------------+--------------+--------------+------------+-------------+--------------+
-     |               |              |              |              |            |             |              |
-     +---------------+--------------+--------------+--------------+------------+-------------+--------------+
-     |               |              |              |              |            |             |              |
-     +---------------+--------------+--------------+--------------+------------+-------------+--------------+
-     |               |              |              |              |            |             |              |
-     +---------------+--------------+--------------+--------------+------------+-------------+--------------+
+     +-----------------+--------------+--------------+--------------+------------+-------------+--------------+
+     | Linux           |  OSX         | Windows      | SunOS        | FreeBSD    | OpenBSD     | NetBSD       |
+     +=================+==============+==============+==============+============+=============+==============+
+     | ctx_switches    |              |              |              |            |             |              |
+     +-----------------+--------------+--------------+--------------+------------+-------------+--------------+
+     | interrupts      |              |              |              |            |             |              |
+     +-----------------+--------------+--------------+--------------+------------+-------------+--------------+
+     | soft_interrupts |              |              |              |            |             |              |
+     +-----------------+--------------+--------------+--------------+------------+-------------+--------------+
+     | procs_running   |              |              |              |            |             |              |
+     +-----------------+--------------+--------------+--------------+------------+-------------+--------------+
+     | procs_blocked   |              |              |              |            |             |              |
+     +-----------------+--------------+--------------+--------------+------------+-------------+--------------+
+     |                 |              |              |              |            |             |              |
+     +-----------------+--------------+--------------+--------------+------------+-------------+--------------+
+     |                 |              |              |              |            |             |              |
+     +-----------------+--------------+--------------+--------------+------------+-------------+--------------+
+     |                 |              |              |              |            |             |              |
+     +-----------------+--------------+--------------+--------------+------------+-------------+--------------+
 
   Example (Linux):
 
   .. code-block:: python
 
      >>> import psutil
      >>> psutil.cpu_stats()
-     scpustats(ctx_switches=20455687, interrupts=6598984, procs_running=1, procs_blocked=0)
+     scpustats(ctx_switches=20455687, interrupts=6598984, soft_interrupts=2134212, procs_running=1, procs_blocked=0)
 
   .. versionadded:: 4.1.0
 

diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py
@@ -246,8 +246,9 @@ def set_scputimes_ntuple(procfs_path):
                                  'read_time', 'write_time',
                                  'read_merged_count', 'write_merged_count',
                                  'busy_time'])
-scpustats = namedtuple('scpustats', ['ctx_switches', 'interrupts',
-                                     'procs_running', 'procs_blocked'])
+scpustats = namedtuple('scpustats',
+                       ['ctx_switches', 'interrupts', 'soft_interrupts',
+                        'procs_running', 'procs_blocked'])
 popenfile = namedtuple('popenfile',
                        ['path', 'fd', 'position', 'mode', 'flags'])
 pmem = namedtuple('pmem', 'rss vms shared text lib data dirty')
@@ -436,6 +437,7 @@ def cpu_stats():
         procs_running = None
         procs_blocked = None
         interrupts = None
+        soft_interrupts = None
         for line in f:
             if line.startswith(b'ctxt'):
                 ctx_switches = int(line.split()[1])
@@ -445,10 +447,14 @@ def cpu_stats():
                 procs_blocked = int(line.split()[1])
             elif line.startswith(b'intr'):
                 interrupts = int(line.split()[1])
+            elif line.startswith(b'softirq'):
+                soft_interrupts = int(line.split()[1])
             if ctx_switches is not None and procs_running is not None and \
-                    procs_blocked is not None and interrupts is not None:
+                    soft_interrupts is not None and procs_blocked is not None \
+                    and interrupts is not None:
                 break
-    return scpustats(ctx_switches, interrupts, procs_running, procs_blocked)
+    return scpustats(ctx_switches, interrupts, soft_interrupts, procs_running,
+                     procs_blocked)
 
 
 # --- other system functions