mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

processes() fix calc (windows)

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2022-01-21 14:39:39 +01:00
parent fba9a0840c
commit 779e61f1c9
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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].cpu | X | X | X | X | X | process % CPU usage |
| | ...[0].cpuu | X | X | | X | | process % CPU usage (user) | | | ...[0].cpuu | X | X | | X | | process % CPU usage (user) |
| | ...[0].cpus | X | X | | X | | process % CPU usage (system) | | | ...[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].priority | X | X | X | X | X | process priotity |
| | ...[0].memVsz | X | X | X | X | X | process virtual memory size | | | ...[0].memVsz | X | X | X | X | X | process virtual memory size |
| | ...[0].memRss | X | X | X | X | X | process mem resident set size | | | ...[0].memRss | X | X | X | X | X | process mem resident set size |

24
lib/processes.js
View File

@ -803,8 +803,10 @@ function processes(callback) {
let procs = []; let procs = [];
let procStats = []; let procStats = [];
let list_new = {}; let list_new = {};
let allcpuu = _processes_cpu.all_utime; let allcpuu = 0;
let allcpus = _processes_cpu.all_stime; let allcpus = 0;
// let allcpuu = _processes_cpu.all_utime;
// let allcpus = _processes_cpu.all_stime;
for (let i = 0; i < processSections.length; i++) { for (let i = 0; i < processSections.length; i++) {
if (processSections[i].trim() !== '') { if (processSections[i].trim() !== '') {
let lines = processSections[i].trim().split('\r\n'); 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 utime = parseInt(util.getValue(lines, 'UserModeTime', ':', true), 10);
let stime = parseInt(util.getValue(lines, 'KernelModeTime', ':', true), 10); let stime = parseInt(util.getValue(lines, 'KernelModeTime', ':', true), 10);
let memw = parseInt(util.getValue(lines, 'WorkingSetSize', ':', true), 10); let memw = parseInt(util.getValue(lines, 'WorkingSetSize', ':', true), 10);
allcpuu += utime - (_processes_cpu.list[pid] ? _processes_cpu.list[pid].utime : 0); allcpuu = allcpuu + utime;
allcpus += stime - (_processes_cpu.list[pid] ? _processes_cpu.list[pid].stime : 0); 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++; result.all++;
if (!statusValue) { result.unknown++; } if (!statusValue) { result.unknown++; }
if (statusValue === '3') { result.running++; } if (statusValue === '3') { result.running++; }
@ -970,8 +974,10 @@ function processLoad(proc, callback) {
let processSections = stdout.split(/\n\s*\n/); let processSections = stdout.split(/\n\s*\n/);
let procStats = []; let procStats = [];
let list_new = {}; let list_new = {};
let allcpuu = _process_cpu.all_utime; let allcpuu = 0;
let allcpus = _process_cpu.all_stime; let allcpus = 0;
// let allcpuu = _process_cpu.all_utime;
// let allcpus = _process_cpu.all_stime;
// go through all processes // go through all processes
for (let i = 0; i < processSections.length; i++) { 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 utime = parseInt(util.getValue(lines, 'UserModeTime', ':', true), 10);
let stime = parseInt(util.getValue(lines, 'KernelModeTime', ':', true), 10); let stime = parseInt(util.getValue(lines, 'KernelModeTime', ':', true), 10);
let mem = parseInt(util.getValue(lines, 'WorkingSetSize', ':', true), 10); let mem = parseInt(util.getValue(lines, 'WorkingSetSize', ':', true), 10);
allcpuu += utime - (_process_cpu.list[pid] ? _process_cpu.list[pid].utime : 0); allcpuu = allcpuu + utime;
allcpus += stime - (_process_cpu.list[pid] ? _process_cpu.list[pid].stime : 0); 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({ procStats.push({
pid: pid, pid: pid,