Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

benchmark: refactor benchmark/common.js #25805

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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