Skip to content

Commit

Permalink
benchmark: fix lint errors
Browse files Browse the repository at this point in the history
PR-URL: #5773
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
  • Loading branch information
Trott authored and Myles Borins committed Mar 21, 2016
1 parent 0943001 commit ddac368
Show file tree
Hide file tree
Showing 14 changed files with 58 additions and 24 deletions.
4 changes: 3 additions & 1 deletion benchmark/arrays/var-int.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
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]
});

Expand Down
4 changes: 3 additions & 1 deletion benchmark/arrays/zero-float.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
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]
});

Expand Down
4 changes: 3 additions & 1 deletion benchmark/arrays/zero-int.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
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]
});

Expand Down
2 changes: 1 addition & 1 deletion benchmark/buffers/buffer-creation.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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);
}
5 changes: 4 additions & 1 deletion benchmark/buffers/buffer-indexof.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
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',
Expand All @@ -14,7 +15,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;

Expand Down
28 changes: 22 additions & 6 deletions benchmark/compare.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,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;
Expand Down Expand Up @@ -134,9 +139,20 @@ 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 pct = c + pct + '%' + 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);
return [l, pct];
Expand Down
4 changes: 2 additions & 2 deletions benchmark/http_simple_auto.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,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

Expand Down
8 changes: 5 additions & 3 deletions benchmark/http_simple_cluster.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
var cluster = require('cluster');
var os = require('os');
'use strict';
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'));
}
1 change: 0 additions & 1 deletion benchmark/idle_clients.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ function connect () {

s.on('close', function () {
if (gotConnected) connections--;
lastClose = new Date();
});

s.on('error', function () {
Expand Down
2 changes: 1 addition & 1 deletion benchmark/misc/domain-fn-args.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function main(conf) {
args = Array.prototype.slice.call(arguments, 1);
ret = fn.apply(this, args);
} else {
ret = fn.call(this);
fn.call(this);
}
}
bdomain.exit();
Expand Down
2 changes: 1 addition & 1 deletion benchmark/misc/freelist.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down
10 changes: 8 additions & 2 deletions benchmark/misc/module-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion benchmark/misc/v8-bench.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ global.load = function(filename) {
global.RegExp = $RegExp;
};

load('run.js');
global.load('run.js');
6 changes: 4 additions & 2 deletions benchmark/tls/throughput.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,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();
Expand All @@ -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();
}
}
Expand Down

0 comments on commit ddac368

Please sign in to comment.