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

processLoad() fix pid (linux)

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2022-11-17 22:22:26 +01:00
parent 131f02dd5b
commit cc186f6781
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/processes.js
View File

@ -1122,7 +1122,7 @@ function processLoad(proc, callback) {
} }
if (_darwin || _linux || _freebsd || _openbsd || _netbsd) { if (_darwin || _linux || _freebsd || _openbsd || _netbsd) {
const params = ['-axo', 'pid,pcpu,pmem,comm']; const params = ['-axo', 'pid,ppid,pcpu,pmem,comm'];
util.execSafe('ps', params).then((stdout) => { util.execSafe('ps', params).then((stdout) => {
if (stdout) { if (stdout) {
let procStats = []; let procStats = [];
@ -1138,12 +1138,13 @@ function processLoad(proc, callback) {
lines.forEach(function (line) { lines.forEach(function (line) {
let data = line.trim().replace(/ +/g, ' ').split(' '); let data = line.trim().replace(/ +/g, ' ').split(' ');
if (data.length > 3) { if (data.length > 4) {
procStats.push({ procStats.push({
name: data[3].substring(data[3].lastIndexOf('/') + 1), name: data[4].substring(data[4].lastIndexOf('/') + 1),
pid: parseInt(data[0]) || 0, pid: parseInt(data[0]) || 0,
cpu: parseFloat(data[1].replace(',', '.')), ppid: parseInt(data[0]) || 0,
mem: parseFloat(data[2].replace(',', '.')) cpu: parseFloat(data[2].replace(',', '.')),
mem: parseFloat(data[3].replace(',', '.'))
}); });
} }
}); });
@ -1168,12 +1169,15 @@ function processLoad(proc, callback) {
if (listPos < 0) { if (listPos < 0) {
result.push({ result.push({
proc: name, proc: name,
pid: item.pid, pid: item.ppid < 10 ? item.pid : null,
pids: [item.pid], pids: [item.pid],
cpu: item.cpu, cpu: item.cpu,
mem: item.mem mem: item.mem
}); });
} else { } else {
if (item.ppid < 10) {
result[listPos].pid = item.pid;
}
result[listPos].pids.push(item.pid); result[listPos].pids.push(item.pid);
result[listPos].cpu += item.cpu; result[listPos].cpu += item.cpu;
result[listPos].mem += item.mem; result[listPos].mem += item.mem;