benchmark: check for and fix multiple end()

PR-URL: #31624 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
nodejs · Mar 17, 2020 · c21fb89 · c21fb89
1 parent 4b0c1a5
commit c21fb89
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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();