Merge pull request #61 from soyuka/cpu-fix

[WIP] Fix cpu percentage on multi threaded processes
soyuka · Jun 11, 2018 · f990f72 · f990f72
2 parents e3f0c05 + eb478da
commit f990f72
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ setInterval(function () {
   pidusage(process.pid, function (err, stats) {
     console.log(stats)
     // => {
-    //   cpu: 10.0,            // percentage (0-100%)
+    //   cpu: 10.0,            // percentage (from 0 to 100*vcore)
     //   memory: 357306368,    // bytes
     //   ppid: 312,            // PPID
     //   pid: 727,             // PID
@@ -41,7 +41,7 @@ pidusage([727, 1234], function (err, stats) {
   console.log(stats)
   // => {
   //   727: {
-  //     cpu: 10.0,            // percentage (0-100%)
+  //     cpu: 10.0,            // percentage (from 0 to 100*vcore)
   //     memory: 357306368,    // bytes
   //     ppid: 312,            // PPID
   //     pid: 727,             // PID
@@ -50,7 +50,7 @@ pidusage([727, 1234], function (err, stats) {
   //     timestamp: 864000000  // ms since epoch
   //   },
   //   1234: {
-  //     cpu: 0.1,             // percentage (0-100%)
+  //     cpu: 0.1,             // percentage (from 0 to 100*vcore)
   //     memory: 3846144,      // bytes
   //     ppid: 727,            // PPID
   //     pid: 1234,            // PID
@@ -65,7 +65,7 @@ pidusage([727, 1234], function (err, stats) {
 const stats = await pidusage(process.pid)
 console.log(stats)
 // => {
-//   cpu: 10.0,            // percentage (0-100%)
+//   cpu: 10.0,            // percentage (from 0 to 100*vcore)
 //   memory: 357306368,    // bytes
 //   ppid: 312,            // PPID
 //   pid: 727,             // PID

diff --git a/lib/procfile.js b/lib/procfile.js
@@ -50,7 +50,7 @@ function readProcFile (pid, options, done) {
     history.set(stat, options.maxage)
 
     return done(null, {
-      cpu: Math.min(cpu, 100.0),
+      cpu: cpu,
       memory: memory,
       ctime: (stat.utime + stat.stime) / cpuInfo.clockTick,
       elapsed: date - (stat.start * 1000),

diff --git a/lib/ps.js b/lib/ps.js
@@ -100,7 +100,7 @@ function ps (pids, options, done) {
       var ctime = parseTime(line[5], true)
 
       statistics[pid] = {
-        cpu: Math.min(cpu, 100.0),
+        cpu: cpu,
         memory: memory,
         ppid: ppid,
         pid: pid,

diff --git a/lib/wmic.js b/lib/wmic.js
@@ -107,7 +107,7 @@ function wmic (pids, options, done) {
       history.set(pid, {ctime: usertime + kerneltime, uptime: uptime}, options.maxage)
 
       statistics[pid] = {
-        cpu: Math.min(cpu, 100.0),
+        cpu: cpu,
         memory: memory,
         ppid: ppid,
         pid: pid,

diff --git a/test/ps.js b/test/ps.js
@@ -41,8 +41,7 @@ test('should parse ps output on Darwin', async t => {
     EOL: os.EOL,
     platform: () => 'darwin',
     type: () => 'type',
-    release: () => 'release',
-    cpus: () => [os.cpus()[0]]
+    release: () => 'release'
   })
 
   const ps = require('../lib/ps')
@@ -106,8 +105,7 @@ test('should parse ps output on *nix', async t => {
     EOL: os.EOL,
     platform: () => 'linux',
     type: () => 'type',
-    release: () => 'release',
-    cpus: () => [os.cpus()[0]]
+    release: () => 'release'
   })
 
   const ps = require('../lib/ps')