mount/system-monitor-graph
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wait_async for get_cpu_use

Browse Source
This commit is contained in:
rcassani 2022-06-11 16:03:50 -04:00
parent d65250d7e6
commit e4e7eb9c81
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
files/system-monitor-graph@rcassani/desklet.js
View File

@ -99,6 +99,7 @@ SystemMonitorGraph.prototype = {
this.hdd_cpu_tot = 0; this.hdd_cpu_tot = 0;
this.hdd_hdd_tot = 0; this.hdd_hdd_tot = 0;
// values to graph // values to graph
this.cpu_use = 0;
this.gpu_use = 0; this.gpu_use = 0;
this.gpu_mem = new Array(2).fill(0.0); this.gpu_mem = new Array(2).fill(0.0);
// set colors // set colors
@ -151,10 +152,10 @@ SystemMonitorGraph.prototype = {
// current values // current values
switch (this.type) { switch (this.type) {
case "cpu": case "cpu":
let cpu_use = this.get_cpu_use(); this.get_cpu_use();
value = cpu_use / 100; value = this.cpu_use / 100;
text1 = _("CPU"); text1 = _("CPU");
text2 = Math.round(cpu_use).toString() + "%"; text2 = Math.round(this.cpu_use).toString() + "%";
break; break;
case "ram": case "ram":
@ -328,17 +329,23 @@ SystemMonitorGraph.prototype = {
get_cpu_use: function() { get_cpu_use: function() {
// https://rosettacode.org/wiki/Linux_CPU_utilization // https://rosettacode.org/wiki/Linux_CPU_utilization
let cpu_line = Cinnamon.get_file_contents_utf8_sync("/proc/stat").match(/cpu\s.+/)[0]; let subprocess = new Gio.Subprocess({
let cpu_values = cpu_line.split(/\s+/); argv: ['head', '-n', '1', '/proc/stat'],
let cpu_idl = parseFloat(cpu_values[4]); flags: Gio.SubprocessFlags.STDOUT_PIPE|Gio.SubprocessFlags.STDERR_PIPE,
let cpu_tot = 0; });
for (let i = 1; i<10; i++){ subprocess.init(null);
cpu_tot += parseFloat(cpu_values[i]) subprocess.wait_async(null, (sourceObject, res) => {
} let [, stdout, stderr] = sourceObject.communicate_utf8(null, null);
let cpu_use = 100 * (1 - (cpu_idl - this.cpu_cpu_idl) / (cpu_tot - this.cpu_cpu_tot)); let cpu_values = stdout.split(/\s+/);
this.cpu_cpu_tot = cpu_tot; let cpu_idl = parseFloat(cpu_values[4]);
this.cpu_cpu_idl = cpu_idl; let cpu_tot = 0;
return cpu_use; for (let i = 1; i<10; i++){
cpu_tot += parseFloat(cpu_values[i])
}
this.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;
});
}, },
get_ram_values: function() { get_ram_values: function() {