From a305ae2308deebc3c950f4a52051b65c00ce24ef Mon Sep 17 00:00:00 2001 From: Brian White Date: Mon, 3 Feb 2020 16:18:29 -0500 Subject: [PATCH] benchmark: check for and fix multiple end() PR-URL: https://github.com/nodejs/node/pull/31624 Reviewed-By: Matteo Collina Reviewed-By: James M Snell Reviewed-By: Luigi Pinca --- benchmark/common.js | 5 +++++ benchmark/streams/writable-manywrites.js | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/benchmark/common.js b/benchmark/common.js index 6a3be4fc376920..c5791c2bacfd5d 100644 --- a/benchmark/common.js +++ b/benchmark/common.js @@ -33,6 +33,7 @@ function Benchmark(fn, configs, options) { this._time = [0, 0]; // Used to make sure a benchmark only start a timer once this._started = false; + this._ended = false; // this._run will use fork() to create a new process for each configuration // combination. @@ -197,6 +198,9 @@ Benchmark.prototype.end = function(operations) { if (!this._started) { throw new Error('called end without start'); } + if (this._ended) { + throw new Error('called end multiple times'); + } if (typeof operations !== 'number') { throw new Error('called end() without specifying operation count'); } @@ -210,6 +214,7 @@ Benchmark.prototype.end = function(operations) { elapsed[1] = 1; } + this._ended = true; const time = elapsed[0] + elapsed[1] / 1e9; const rate = operations / time; this.report(rate, elapsed); diff --git a/benchmark/streams/writable-manywrites.js b/benchmark/streams/writable-manywrites.js index 049bf8eb281db2..e4ae9ab91e5f4a 100644 --- a/benchmark/streams/writable-manywrites.js +++ b/benchmark/streams/writable-manywrites.js @@ -35,8 +35,10 @@ function main({ n, sync, writev, callback }) { let k = 0; function run() { while (k++ < n && s.write(b, cb)); - if (k >= n) + if (k >= n) { bench.end(n); + s.removeListener('drain', run); + } } s.on('drain', run); run();