chg: plugin(percpu) - show times based on host OS

nicolargo · Jul 1, 2024 · 6af2340 · 6af2340
1 parent 46abd4b
commit 6af2340
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/glances/cpu_percent.py b/glances/cpu_percent.py
@@ -38,6 +38,8 @@ class PerCpuPercentInfo(TypedDict):
     steal: Optional[float]
     guest: Optional[float]
     guest_nice: Optional[float]
+    dpc: Optional[float]
+    interrupt: Optional[float]
 
 
 class CpuPercent:
@@ -146,6 +148,8 @@ def _compute_percpu(self) -> List[PerCpuPercentInfo]:
                 'steal': cpu_times.steal if hasattr(cpu_times, 'steal') else None,
                 'guest': cpu_times.guest if hasattr(cpu_times, 'guest') else None,
                 'guest_nice': cpu_times.steal if hasattr(cpu_times, 'guest_nice') else None,
+                'dpc': cpu_times.dpc if hasattr(cpu_times, 'dpc') else None,
+                'interrupt': cpu_times.interrupt if hasattr(cpu_times, 'interrupt') else None,
             }
             for cpu_number, cpu_times in psutil_percpu
         ]

diff --git a/glances/plugins/percpu/__init__.py b/glances/plugins/percpu/__init__.py
@@ -9,6 +9,7 @@
 """Per-CPU plugin."""
 
 from glances.cpu_percent import cpu_percent
+from glances.globals import BSD, LINUX, MACOS, WINDOWS
 from glances.plugins.plugin.model import GlancesPluginModel
 
 # Fields description
@@ -76,6 +77,14 @@
         'description': '*(Linux)*: percent of time spent handling software interrupts.',
         'unit': 'percent',
     },
+    'dpc': {
+        'description': '*(Windows)*: percent of time spent handling deferred procedure calls.',
+        'unit': 'percent',
+    },
+    'interrupt': {
+        'description': '*(Windows)*: percent of time spent handling software interrupts.',
+        'unit': 'percent',
+    },
 }
 
 # Define the history items list
@@ -140,11 +149,17 @@ def msg_curse(self, args=None, max_width=None):
         if not self.stats or not self.args.percpu or self.is_disabled():
             return ret
 
-        # Define the default header
-        all_headers = ['user', 'system', 'idle', 'iowait', 'steal']
-
-        # Determine applicable headers
-        header = [h for h in all_headers if self.stats[0].get(h) is not None]
+        # Define the headers based on OS
+        header = ['user', 'system']
+
+        if LINUX:
+            header.extend(['iowait', 'idle', 'irq', 'nice', 'steal', 'guest'])
+        elif MACOS:
+            header.extend(['idle', 'nice'])
+        elif BSD:
+            header.extend(['idle', 'irq', 'nice'])
+        elif WINDOWS:
+            header.extend(['dpc', 'interrupt'])
 
         # Build the string message
         if self.is_disabled('quicklook'):