From 4cca32cecd65ea71e63af4028746e2a4a171788e Mon Sep 17 00:00:00 2001
From: Akashdeep Dhar <akashdeep.dhar@gmail.com>
Date: Dec 04 2021 06:33:05 +0000
Subject: Rework cputwind subpackage under readers package


For additional metrics and refined structure

Signed-off-by: Akashdeep Dhar <akashdeep.dhar@gmail.com>

---

diff --git a/obserware/readers/cputwind/provider.py b/obserware/readers/cputwind/provider.py
index 8e476b2..47bddf9 100644
--- a/obserware/readers/cputwind/provider.py
+++ b/obserware/readers/cputwind/provider.py
@@ -21,23 +21,45 @@ import psutil
 
 
 def return_mainscreen_threaded_statistics():
-    timelist, cputimes, cpuindex = [], psutil.cpu_times(percpu=True), 0
-    for indx in cputimes:
-        timelist.append(
-            (
-                cpuindex + 1,
-                indx.user,
-                indx.nice,
-                indx.system,
-                indx.idle,
-                indx.iowait,
-                indx.irq,
-                indx.softirq,
-                indx.steal,
-                indx.guest,
-                indx.guest_nice,
-            )
-        )
-        cpuindex += 1
-    retndata = {"timelist": timelist, "cpucount": psutil.cpu_count()}
+    timedict, cputsecs, cputperc, cputusej, cputqant = (
+        {},
+        psutil.cpu_times(percpu=True),
+        psutil.cpu_times_percent(percpu=True),
+        psutil.cpu_percent(percpu=True),
+        psutil.cpu_count(),
+    )
+    for indx in range(cputqant):
+        timedict[indx] = {
+            "usage": cputusej[indx],
+            "seconds": {
+                "user": cputsecs[indx].user,
+                "nice": cputsecs[indx].nice,
+                "system": cputsecs[indx].system,
+                "idle": cputsecs[indx].idle,
+                "iowait": cputsecs[indx].iowait,
+                "irq": cputsecs[indx].irq,
+                "softirq": cputsecs[indx].softirq,
+                "steal": cputsecs[indx].steal,
+                "guest": cputsecs[indx].guest,
+                "guest_nice": cputsecs[indx].guest_nice,
+            },
+            "percent": {
+                "user": cputperc[indx].user,
+                "nice": cputperc[indx].nice,
+                "system": cputperc[indx].system,
+                "idle": cputperc[indx].idle,
+                "iowait": cputperc[indx].iowait,
+                "irq": cputperc[indx].irq,
+                "softirq": cputperc[indx].softirq,
+                "steal": cputperc[indx].steal,
+                "guest": cputperc[indx].guest,
+                "guest_nice": cputperc[indx].guest_nice,
+            },
+        }
+    retndata = {"timedict": timedict}
+    return retndata
+
+
+def return_mainscreen_onetimed_statistics():
+    retndata = psutil.cpu_count()
     return retndata