Skip to content

Commit

Permalink
benchmark: refactor benchmark/common.js
Browse files Browse the repository at this point in the history
Refactor benchmark/common.js to consistently use arrow functions for
anonymous callbacks and trailing commas.

PR-URL: #25805
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
  • Loading branch information
Trott authored and addaleax committed Feb 1, 2019
1 parent 40398fd commit 18b344c
Showing 1 changed file with 18 additions and 17 deletions.
35 changes: 18 additions & 17 deletions benchmark/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,19 @@ Benchmark.prototype.http = function(options, cb) {
self.config.benchmarker ||
self.extra_options.benchmarker ||
exports.default_http_benchmarker;
http_benchmarkers.run(http_options, function(error, code, used_benchmarker,
result, elapsed) {
if (cb) {
cb(code);
}
if (error) {
console.error(error);
process.exit(code || 1);
http_benchmarkers.run(
http_options, (error, code, used_benchmarker, result, elapsed) => {
if (cb) {
cb(code);
}
if (error) {
console.error(error);
process.exit(code || 1);
}
self.config.benchmarker = used_benchmarker;
self.report(result, elapsed);
}
self.config.benchmarker = used_benchmarker;
self.report(result, elapsed);
});
);
};

Benchmark.prototype._run = function() {
Expand All @@ -139,7 +140,7 @@ Benchmark.prototype._run = function() {
process.send({
type: 'config',
name: this.name,
queueLength: this.queue.length
queueLength: this.queue.length,
});
}

Expand All @@ -162,10 +163,10 @@ Benchmark.prototype._run = function() {

const child = child_process.fork(require.main.filename, childArgs, {
env: childEnv,
execArgv: self.flags.concat(process.execArgv)
execArgv: self.flags.concat(process.execArgv),
});
child.on('message', sendResult);
child.on('close', function(code) {
child.on('close', (code) => {
if (code) {
process.exit(code);
return;
Expand Down Expand Up @@ -241,7 +242,7 @@ Benchmark.prototype.report = function(rate, elapsed) {
conf: this.config,
rate: rate,
time: elapsed[0] + elapsed[1] / 1e9,
type: 'report'
type: 'report',
});
};

Expand All @@ -267,7 +268,7 @@ const urls = {
ws: 'ws://localhost:9229/f46db715-70df-43ad-a359-7f9949f39868',
javascript: 'javascript:alert("node is awesome");',
percent: 'https://%E4%BD%A0/foo',
dot: 'https://example.org/./a/../b/./c'
dot: 'https://example.org/./a/../b/./c',
};
exports.urls = urls;

Expand All @@ -282,7 +283,7 @@ const searchParams = {
'foo=ghi&foo=jkl&foo=mno&foo=pqr&foo=stu&foo=vwxyz',
manypairs: 'a&b&c&d&e&f&g&h&i&j&k&l&m&n&o&p&q&r&s&t&u&v&w&x&y&z',
manyblankpairs: '&&&&&&&&&&&&&&&&&&&&&&&&',
altspaces: 'foo+bar=baz+quux&xyzzy+thud=quuy+quuz&abc=def+ghi'
altspaces: 'foo+bar=baz+quux&xyzzy+thud=quuy+quuz&abc=def+ghi',
};
exports.searchParams = searchParams;

Expand Down

0 comments on commit 18b344c

Please sign in to comment.