From b955d022666ed50fcb303b23a41ba193a295bdc6 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 2 Mar 2016 13:38:23 -0800 Subject: [PATCH] benchmark: fix lint errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/5517 Reviewed-By: Brian White Reviewed-By: Michaël Zasso Reviewed-By: Evan Lucas Reviewed-By: James M Snell --- benchmark/arrays/var-int.js | 4 +++- benchmark/arrays/zero-float.js | 4 +++- benchmark/arrays/zero-int.js | 4 +++- benchmark/buffers/buffer-creation.js | 2 +- benchmark/buffers/buffer-indexof.js | 5 ++++- benchmark/compare.js | 25 ++++++++++++++++++++----- benchmark/domain/domain-fn-args.js | 4 ++-- benchmark/fs/bench-readdir.js | 3 ++- benchmark/fs/bench-readdirSync.js | 3 ++- benchmark/http_simple_auto.js | 4 ++-- benchmark/http_simple_cluster.js | 7 ++++--- benchmark/idle_clients.js | 1 - benchmark/misc/freelist.js | 2 +- benchmark/misc/v8-bench.js | 2 +- benchmark/module/module-loader.js | 10 ++++++++-- benchmark/tls/throughput.js | 6 ++++-- 16 files changed, 60 insertions(+), 26 deletions(-) diff --git a/benchmark/arrays/var-int.js b/benchmark/arrays/var-int.js index 4f9010aabc..74a73c9515 100644 --- a/benchmark/arrays/var-int.js +++ b/benchmark/arrays/var-int.js @@ -1,7 +1,9 @@ 'use strict'; var common = require('../common.js'); var bench = common.createBenchmark(main, { - type: 'Array Buffer Int8Array Uint8Array Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array'.split(' '), + type: ['Array', 'Buffer', 'Int8Array', 'Uint8Array', 'Int16Array', + 'Uint16Array', 'Int32Array', 'Uint32Array', 'Float32Array', + 'Float64Array'], n: [25] }); diff --git a/benchmark/arrays/zero-float.js b/benchmark/arrays/zero-float.js index 0186394ad9..e2569eed5c 100644 --- a/benchmark/arrays/zero-float.js +++ b/benchmark/arrays/zero-float.js @@ -1,7 +1,9 @@ 'use strict'; var common = require('../common.js'); var bench = common.createBenchmark(main, { - type: 'Array Buffer Int8Array Uint8Array Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array'.split(' '), + type: ['Array', 'Buffer', 'Int8Array', 'Uint8Array', 'Int16Array', + 'Uint16Array', 'Int32Array', 'Uint32Array', 'Float32Array', + 'Float64Array'], n: [25] }); diff --git a/benchmark/arrays/zero-int.js b/benchmark/arrays/zero-int.js index 3b1b0ab821..8be70c1e87 100644 --- a/benchmark/arrays/zero-int.js +++ b/benchmark/arrays/zero-int.js @@ -1,7 +1,9 @@ 'use strict'; var common = require('../common.js'); var bench = common.createBenchmark(main, { - type: 'Array Buffer Int8Array Uint8Array Int16Array Uint16Array Int32Array Uint32Array Float32Array Float64Array'.split(' '), + type: ['Array', 'Buffer', 'Int8Array', 'Uint8Array', 'Int16Array', + 'Uint16Array', 'Int32Array', 'Uint32Array', 'Float32Array', + 'Float64Array'], n: [25] }); diff --git a/benchmark/buffers/buffer-creation.js b/benchmark/buffers/buffer-creation.js index 6f4b2c9579..dfb68467cc 100644 --- a/benchmark/buffers/buffer-creation.js +++ b/benchmark/buffers/buffer-creation.js @@ -14,7 +14,7 @@ function main(conf) { var clazz = conf.type === 'fast' ? Buffer : SlowBuffer; bench.start(); for (var i = 0; i < n * 1024; i++) { - b = new clazz(len); + new clazz(len); } bench.end(n); } diff --git a/benchmark/buffers/buffer-indexof.js b/benchmark/buffers/buffer-indexof.js index 7ae2669490..6f10033020 100644 --- a/benchmark/buffers/buffer-indexof.js +++ b/benchmark/buffers/buffer-indexof.js @@ -1,6 +1,7 @@ 'use strict'; var common = require('../common.js'); var fs = require('fs'); +const path = require('path'); var bench = common.createBenchmark(main, { search: ['@', 'SQ', '10x', '--l', 'Alice', 'Gryphon', 'Panther', @@ -15,7 +16,9 @@ var bench = common.createBenchmark(main, { function main(conf) { var iter = (conf.iter) * 100000; - var aliceBuffer = fs.readFileSync(__dirname + '/../fixtures/alice.html'); + var aliceBuffer = fs.readFileSync( + path.resolve(__dirname, '../fixtures/alice.html') + ); var search = conf.search; var encoding = conf.encoding; diff --git a/benchmark/compare.js b/benchmark/compare.js index 2f1e7809ea..21d4b2b6a4 100644 --- a/benchmark/compare.js +++ b/benchmark/compare.js @@ -77,10 +77,15 @@ function run() { var out = ''; var child; - if (Array.isArray(benchmarks) && benchmarks.length) - child = spawn(node, ['benchmark/common.js'].concat(benchmarks), { env: env }); - else + if (Array.isArray(benchmarks) && benchmarks.length) { + child = spawn( + node, + ['benchmark/common.js'].concat(benchmarks), + { env: env } + ); + } else { child = spawn('make', [runBench], { env: env }); + } child.stdout.setEncoding('utf8'); child.stdout.on('data', function(c) { out += c; @@ -136,8 +141,18 @@ function compare() { if (show === 'green' && !g || show === 'red' && !r) return; - var r0 = util.format('%s%s: %d%s', g, nodes[0], n0.toPrecision(5), g ? reset : ''); - var r1 = util.format('%s%s: %d%s', r, nodes[1], n1.toPrecision(5), r ? reset : ''); + var r0 = util.format( + '%s%s: %d%s', + g, + nodes[0], + n0.toPrecision(5), g ? reset : '' + ); + var r1 = util.format( + '%s%s: %d%s', + r, + nodes[1], + n1.toPrecision(5), r ? reset : '' + ); pct = c + pct + '%' + reset; var l = util.format('%s: %s %s', bench, r0, r1); maxLen = Math.max(l.length + pct.length, maxLen); diff --git a/benchmark/domain/domain-fn-args.js b/benchmark/domain/domain-fn-args.js index 321334dbf1..e9b24811c8 100644 --- a/benchmark/domain/domain-fn-args.js +++ b/benchmark/domain/domain-fn-args.js @@ -20,9 +20,9 @@ function main(conf) { for (var i = 0; i < n; i++) { if (myArguments.length >= 2) { args = Array.prototype.slice.call(myArguments, 1); - ret = fn.apply(this, args); + fn.apply(this, args); } else { - ret = fn.call(this); + fn.call(this); } } bdomain.exit(); diff --git a/benchmark/fs/bench-readdir.js b/benchmark/fs/bench-readdir.js index 2f0eab6a82..565b92d149 100644 --- a/benchmark/fs/bench-readdir.js +++ b/benchmark/fs/bench-readdir.js @@ -2,6 +2,7 @@ const common = require('../common'); const fs = require('fs'); +const path = require('path'); const bench = common.createBenchmark(main, { n: [1e4], @@ -15,7 +16,7 @@ function main(conf) { (function r(cntr) { if (--cntr <= 0) return bench.end(n); - fs.readdir(__dirname + '/../../lib/', function() { + fs.readdir(path.resolve(__dirname, '../../lib/'), function() { r(cntr); }); }(n)); diff --git a/benchmark/fs/bench-readdirSync.js b/benchmark/fs/bench-readdirSync.js index 9f89649138..8ba2a6ec49 100644 --- a/benchmark/fs/bench-readdirSync.js +++ b/benchmark/fs/bench-readdirSync.js @@ -2,6 +2,7 @@ const common = require('../common'); const fs = require('fs'); +const path = require('path'); const bench = common.createBenchmark(main, { n: [1e4], @@ -13,7 +14,7 @@ function main(conf) { bench.start(); for (var i = 0; i < n; i++) { - fs.readdirSync(__dirname + '/../../lib/'); + fs.readdirSync(path.resolve(__dirname, '../../lib/')); } bench.end(n); } diff --git a/benchmark/http_simple_auto.js b/benchmark/http_simple_auto.js index 1f3c8e7612..a2271ce1e0 100644 --- a/benchmark/http_simple_auto.js +++ b/benchmark/http_simple_auto.js @@ -111,10 +111,10 @@ server.listen(port, function() { }); function dump_mm_stats() { - if (typeof gc != 'function') return; + if (typeof global.gc != 'function') return; var before = process.memoryUsage(); - for (var i = 0; i < 10; ++i) gc(); + for (var i = 0; i < 10; ++i) global.gc(); var after = process.memoryUsage(); setTimeout(print_stats, 250); // give GC time to settle diff --git a/benchmark/http_simple_cluster.js b/benchmark/http_simple_cluster.js index c2c792c5cb..f48a2a2599 100644 --- a/benchmark/http_simple_cluster.js +++ b/benchmark/http_simple_cluster.js @@ -1,10 +1,11 @@ 'use strict'; -var cluster = require('cluster'); -var os = require('os'); +const cluster = require('cluster'); +const os = require('os'); +const path = require('path'); if (cluster.isMaster) { console.log('master running on pid %d', process.pid); for (var i = 0, n = os.cpus().length; i < n; ++i) cluster.fork(); } else { - require(__dirname + '/http_simple.js'); + require(path.join(__dirname, 'http_simple.js')); } diff --git a/benchmark/idle_clients.js b/benchmark/idle_clients.js index 9014d231d4..d294e68522 100644 --- a/benchmark/idle_clients.js +++ b/benchmark/idle_clients.js @@ -17,7 +17,6 @@ function connect() { s.on('close', function() { if (gotConnected) connections--; - lastClose = new Date(); }); s.on('error', function() { diff --git a/benchmark/misc/freelist.js b/benchmark/misc/freelist.js index 76275000b0..7956dc3d6b 100644 --- a/benchmark/misc/freelist.js +++ b/benchmark/misc/freelist.js @@ -22,7 +22,7 @@ function main(conf) { bench.start(); - for (i = 0; i < n; i++){ + for (i = 0; i < n; i++) { // Return all the items to the pool for (j = 0; j < poolSize; j++) { list.free(used[j]); diff --git a/benchmark/misc/v8-bench.js b/benchmark/misc/v8-bench.js index 606170acb3..0b9a5139ba 100644 --- a/benchmark/misc/v8-bench.js +++ b/benchmark/misc/v8-bench.js @@ -20,4 +20,4 @@ global.load = function(filename) { global.RegExp = $RegExp; }; -load('run.js'); +global.load('run.js'); diff --git a/benchmark/module/module-loader.js b/benchmark/module/module-loader.js index 8c31f36522..1df7a74cbe 100644 --- a/benchmark/module/module-loader.js +++ b/benchmark/module/module-loader.js @@ -18,8 +18,14 @@ function main(conf) { var n = +conf.thousands * 1e3; for (var i = 0; i <= n; i++) { fs.mkdirSync(benchmarkDirectory + i); - fs.writeFileSync(benchmarkDirectory + i + '/package.json', '{"main": "index.js"}'); - fs.writeFileSync(benchmarkDirectory + i + '/index.js', 'module.exports = "";'); + fs.writeFileSync( + benchmarkDirectory + i + '/package.json', + '{"main": "index.js"}' + ); + fs.writeFileSync( + benchmarkDirectory + i + '/index.js', + 'module.exports = "";' + ); } measure(n); diff --git a/benchmark/tls/throughput.js b/benchmark/tls/throughput.js index cbc5ffc0fb..7b545267ac 100644 --- a/benchmark/tls/throughput.js +++ b/benchmark/tls/throughput.js @@ -45,9 +45,10 @@ function main(conf) { server = tls.createServer(options, onConnection); setTimeout(done, dur * 1000); + var conn; server.listen(common.PORT, function() { var opt = { port: common.PORT, rejectUnauthorized: false }; - var conn = tls.connect(opt, function() { + conn = tls.connect(opt, function() { bench.start(); conn.on('drain', write); write(); @@ -68,7 +69,8 @@ function main(conf) { function done() { var mbits = (received * 8) / (1024 * 1024); bench.end(mbits); - conn.destroy(); + if (conn) + conn.destroy(); server.close(); } }