From d464150d22ac177ee88d8fd1c746cd1358ae0285 Mon Sep 17 00:00:00 2001 From: Tjatse Date: Wed, 17 Dec 2014 11:24:55 +0800 Subject: [PATCH] rm useless module --- lib/stat.js | 53 +++++++--------------------------------------------- package.json | 1 - 2 files changed, 7 insertions(+), 47 deletions(-) diff --git a/lib/stat.js b/lib/stat.js index 8522870..0323f6e 100644 --- a/lib/stat.js +++ b/lib/stat.js @@ -1,8 +1,5 @@ -var usage = require('usage'), - os = require('os'), - exec = require('child_process').exec, - winCPU = require('windows-cpu'), - isWindows = process.platform == 'win32'; +var os = require('os'), + exec = require('child_process').exec; /** * System states @@ -57,19 +54,11 @@ var stat = module.exports = { * @param fn */ stat.cpuUsage = function(fn){ - if (isWindows) { - winCPU.totalLoad(function(err, results){ - fn(err, results.reduce(function(p1, p2){ - return (p1 + (p2 || p1)) / 2; - }).toFixed(2)); - }) - } else { - setTimeout(function(ctx, stat1){ - var stat2 = ctx.cpuInfo(), - perc = 100 * (1 - (stat2.idle - stat1.idle) / (stat2.total - stat1.total)); - fn(null, perc.toFixed(2)); - }, 1000, this, this.cpuInfo()); - } + setTimeout(function(ctx, stat1){ + var stat2 = ctx.cpuInfo(), + perc = 100 * (1 - (stat2.idle - stat1.idle) / (stat2.total - stat1.total)); + fn(null, perc.toFixed(2)); + }, 1000, this, this.cpuInfo()); }; /** @@ -89,32 +78,4 @@ stat.cpuInfo = function(fn){ 'idle' : idle, 'total': total }; -}; - -/** - * Get memory usage by process id. - * @param {String} pid - * @param {Function} cb - */ -stat.memoryUsage = function(pid, cb){ - if (isWindows) { - exec('TaskList /fi "PID eq ' + pid + '" /fo CSV', function(err, stdout, stderr){ - if (err) { - return cb(err); - } - var lines = stdout.split('\n'); - if (lines != 2) { - return cb(null, '0'); - } - var data = lines[1].split(','); - cb(data.length == 0 ? '0' : data[data.length - 1].replace(/[\'\",\s]/g, '')); - }) - } else { - usage.lookup(pid, function(err, result){ - if (err) { - return cb(err); - } - return cb(null, result.memory); - }); - } }; \ No newline at end of file diff --git a/package.json b/package.json index 42ff134..ccd632d 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,6 @@ "chalk": "~0.5.1", "express": "~4.10.1", "swig": "~1.4.2", - "usage": "~0.5.0", "windows-cpu": "~0.1.1", "socket.io": "~1.2.0", "nconf": "~0.6.9",