external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

Linux CPU utilization improvement, #4039

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2022-05-25 10:04:37 -07:00
parent 4e9daa4286
commit 1188f0711f
2 changed files with 42 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

35
agents/modules_meshcmd/sysinfo.js
View file

@ -106,32 +106,39 @@ function windows_memUtilization()
return (ret); return (ret);
} }
function linux_cpuUtilization() var cpuLastIdle = [];
{ var cpuLastSum = [];
function linux_cpuUtilization() {
var ret = { cpus: [] }; var ret = { cpus: [] };
var info = require('fs').readFileSync('/proc/stat'); var info = require('fs').readFileSync('/proc/stat');
var lines = info.toString().split('\n'); var lines = info.toString().split('\n');
var columns; var columns;
var x, y; var x, y;
var sum, idle, utilization; var cpuNo = 0;
for (var i in lines) var currSum, currIdle, utilization;
{ for (var i in lines) {
columns = lines[i].split(' '); columns = lines[i].split(' ');
if (!columns[0].startsWith('cpu')) { break; } if (!columns[0].startsWith('cpu')) { break; }
x = 0, sum = 0; x = 0, currSum = 0;
while (columns[++x] == ''); while (columns[++x] == '');
for (y = x; y < columns.length; ++y) { sum += parseInt(columns[y]); } for (y = x; y < columns.length; ++y) { currSum += parseInt(columns[y]); }
idle = parseInt(columns[3 + x]); currIdle = parseInt(columns[3 + x]);
utilization = (100 - ((idle / sum) * 100)); //.toFixed(2);
if (!ret.total) var diffIdle = currIdle - cpuLastIdle[cpuNo];
{ var diffSum = currSum - cpuLastSum[cpuNo];
utilization = (100 - ((diffIdle / diffSum) * 100));
cpuLastSum[cpuNo] = currSum;
cpuLastIdle[cpuNo] = currIdle;
if (!ret.total) {
ret.total = utilization; ret.total = utilization;
} } else {
else
{
ret.cpus.push(utilization); ret.cpus.push(utilization);
} }
++cpuNo;
} }
var p = new promise(function (res, rej) { this._res = res; this._rej = rej; }); var p = new promise(function (res, rej) { this._res = res; this._rej = rej; });

35
agents/modules_meshcore/sysinfo.js
View file

@ -106,32 +106,39 @@ function windows_memUtilization()
return (ret); return (ret);
} }
function linux_cpuUtilization() var cpuLastIdle = [];
{ var cpuLastSum = [];
function linux_cpuUtilization() {
var ret = { cpus: [] }; var ret = { cpus: [] };
var info = require('fs').readFileSync('/proc/stat'); var info = require('fs').readFileSync('/proc/stat');
var lines = info.toString().split('\n'); var lines = info.toString().split('\n');
var columns; var columns;
var x, y; var x, y;
var sum, idle, utilization; var cpuNo = 0;
for (var i in lines) var currSum, currIdle, utilization;
{ for (var i in lines) {
columns = lines[i].split(' '); columns = lines[i].split(' ');
if (!columns[0].startsWith('cpu')) { break; } if (!columns[0].startsWith('cpu')) { break; }
x = 0, sum = 0; x = 0, currSum = 0;
while (columns[++x] == ''); while (columns[++x] == '');
for (y = x; y < columns.length; ++y) { sum += parseInt(columns[y]); } for (y = x; y < columns.length; ++y) { currSum += parseInt(columns[y]); }
idle = parseInt(columns[3 + x]); currIdle = parseInt(columns[3 + x]);
utilization = (100 - ((idle / sum) * 100)); //.toFixed(2);
if (!ret.total) var diffIdle = currIdle - cpuLastIdle[cpuNo];
{ var diffSum = currSum - cpuLastSum[cpuNo];
utilization = (100 - ((diffIdle / diffSum) * 100));
cpuLastSum[cpuNo] = currSum;
cpuLastIdle[cpuNo] = currIdle;
if (!ret.total) {
ret.total = utilization; ret.total = utilization;
} } else {
else
{
ret.cpus.push(utilization); ret.cpus.push(utilization);
} }
++cpuNo;
} }
var p = new promise(function (res, rej) { this._res = res; this._rej = rej; }); var p = new promise(function (res, rej) { this._res = res; this._rej = rej; });