From 4cac0ce8f81ca5306297cfddc0f19ab62d53b7cc Mon Sep 17 00:00:00 2001
From: Raymundo Cassani <raymundo.cassani@gmail.com>
Date: Sun, 31 May 2020 10:00:45 -0400
Subject: [PATCH] Update CPU use calculation

---
 .../system-monitor-graph@rcassani/desklet.js  | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/files/system-monitor-graph@rcassani/desklet.js b/files/system-monitor-graph@rcassani/desklet.js
index 3174507..3c30ef9 100644
--- a/files/system-monitor-graph@rcassani/desklet.js
+++ b/files/system-monitor-graph@rcassani/desklet.js
@@ -80,9 +80,8 @@ MyDesklet.prototype = {
         if (this.first_run){
             this.n_values = Math.floor(this.duration / this.refresh_interval)  + 1;
             this.values = new Array(this.n_values).fill(0.0);
-            let cpu_values = this.get_cpu_times();
-            this.cpu_tot = cpu_values[0];
-            this.cpu_idl = cpu_values[1];
+            this.cpu_cpu_tot = 0;
+            this.cpu_cpu_idl = 0;
             // set colors
             switch (this.type) {
               case "cpu":
@@ -124,12 +123,7 @@ MyDesklet.prototype = {
         // current values
         switch (this.type) {
           case "cpu":
-              let cpu_values = this.get_cpu_times();
-              let cpu_tot = cpu_values[0];
-              let cpu_idl = cpu_values[1];
-              let cpu_use = 100 * (1 - (cpu_idl - this.cpu_idl) / (cpu_tot - this.cpu_tot));
-              this.cpu_tot = cpu_tot;
-              this.cpu_idl = cpu_idl;
+              let cpu_use = this.get_cpu_use();
               value = cpu_use / 100;
               text1 = "CPU";
               text2 = Math.round(cpu_use).toString() + "%";
@@ -253,7 +247,7 @@ MyDesklet.prototype = {
         Mainloop.source_remove(this.timeout);
     },
 
-    get_cpu_times: function() {
+    get_cpu_use: function() {
         // https://rosettacode.org/wiki/Linux_CPU_utilization
         let cpu_line = Cinnamon.get_file_contents_utf8_sync("/proc/stat").match(/cpu\s.+/)[0];
         let cpu_values = cpu_line.split(/\s+/);
@@ -262,7 +256,10 @@ MyDesklet.prototype = {
         for (let i = 1; i<10; i++){
           cpu_tot += parseFloat(cpu_values[i])
         }
-        return [cpu_tot, cpu_idl];
+        let cpu_use = 100 * (1 - (cpu_idl - this.cpu_cpu_idl) / (cpu_tot - this.cpu_cpu_tot));
+        this.cpu_cpu_tot = cpu_tot;
+        this.cpu_cpu_idl = cpu_idl;
+        return cpu_use;
     },
 
     get_ram_values: function() {