From 779e61f1c9412667bc7d79a8cf00608b0e7dd644 Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Fri, 21 Jan 2022 14:39:39 +0100 Subject: [PATCH] processes() fix calc (windows) --- README.md | 2 +- lib/processes.js | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index f5ee384..9a6cf16 100644 --- a/README.md +++ b/README.md @@ -384,7 +384,7 @@ Full function reference with examples can be found at [https://systeminformation | | ...[0].cpu | X | X | X | X | X | process % CPU usage | | | ...[0].cpuu | X | X | | X | | process % CPU usage (user) | | | ...[0].cpus | X | X | | X | | process % CPU usage (system) | -| | ...[0].pmem | X | X | X | X | X | process memory % | +| | ...[0].mem | X | X | X | X | X | process memory % | | | ...[0].priority | X | X | X | X | X | process priotity | | | ...[0].memVsz | X | X | X | X | X | process virtual memory size | | | ...[0].memRss | X | X | X | X | X | process mem resident set size | diff --git a/lib/processes.js b/lib/processes.js index abc6537..10b7f73 100644 --- a/lib/processes.js +++ b/lib/processes.js @@ -803,8 +803,10 @@ function processes(callback) { let procs = []; let procStats = []; let list_new = {}; - let allcpuu = _processes_cpu.all_utime; - let allcpus = _processes_cpu.all_stime; + let allcpuu = 0; + let allcpus = 0; + // let allcpuu = _processes_cpu.all_utime; + // let allcpus = _processes_cpu.all_stime; for (let i = 0; i < processSections.length; i++) { if (processSections[i].trim() !== '') { let lines = processSections[i].trim().split('\r\n'); @@ -817,8 +819,10 @@ function processes(callback) { let utime = parseInt(util.getValue(lines, 'UserModeTime', ':', true), 10); let stime = parseInt(util.getValue(lines, 'KernelModeTime', ':', true), 10); let memw = parseInt(util.getValue(lines, 'WorkingSetSize', ':', true), 10); - allcpuu += utime - (_processes_cpu.list[pid] ? _processes_cpu.list[pid].utime : 0); - allcpus += stime - (_processes_cpu.list[pid] ? _processes_cpu.list[pid].stime : 0); + allcpuu = allcpuu + utime; + allcpus = allcpus + stime; + // allcpuu += utime - (_processes_cpu.list[pid] ? _processes_cpu.list[pid].utime : 0); + // allcpus += stime - (_processes_cpu.list[pid] ? _processes_cpu.list[pid].stime : 0); result.all++; if (!statusValue) { result.unknown++; } if (statusValue === '3') { result.running++; } @@ -970,8 +974,10 @@ function processLoad(proc, callback) { let processSections = stdout.split(/\n\s*\n/); let procStats = []; let list_new = {}; - let allcpuu = _process_cpu.all_utime; - let allcpus = _process_cpu.all_stime; + let allcpuu = 0; + let allcpus = 0; + // let allcpuu = _process_cpu.all_utime; + // let allcpus = _process_cpu.all_stime; // go through all processes for (let i = 0; i < processSections.length; i++) { @@ -982,8 +988,10 @@ function processLoad(proc, callback) { let utime = parseInt(util.getValue(lines, 'UserModeTime', ':', true), 10); let stime = parseInt(util.getValue(lines, 'KernelModeTime', ':', true), 10); let mem = parseInt(util.getValue(lines, 'WorkingSetSize', ':', true), 10); - allcpuu += utime - (_process_cpu.list[pid] ? _process_cpu.list[pid].utime : 0); - allcpus += stime - (_process_cpu.list[pid] ? _process_cpu.list[pid].stime : 0); + allcpuu = allcpuu + utime; + allcpus = allcpus + stime; + // allcpuu += utime - (_process_cpu.list[pid] ? _process_cpu.list[pid].utime : 0); + // allcpus += stime - (_process_cpu.list[pid] ? _process_cpu.list[pid].stime : 0); procStats.push({ pid: pid,