benchmark: fix http2 benchmarks

Fixes: #36746 PR-URL: #36871 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Gireesh Punathil <[email protected]>
nodejs · May 1, 2021 · c22efc5 · c22efc5
1 parent 5770ae0
commit c22efc5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/benchmark/_test-double-benchmarker.js b/benchmark/_test-double-benchmarker.js
@@ -46,7 +46,7 @@ function run() {
     }
   } else { // HTTP/2
     const client = http.connect(url);
-    client.on('error', (e) => { throw e; });
+    client.on('error', () => {});
     request(client.request(), client);
   }
 }

diff --git a/benchmark/http2/compat.js b/benchmark/http2/compat.js
@@ -24,9 +24,10 @@ function main({ requests, streams, clients, duration }) {
       res.destroy();
     });
   });
-  server.listen(common.PORT, () => {
+  server.listen(0, () => {
     bench.http({
       path: '/',
+      port: server.address().port,
       requests,
       maxConcurrentStreams: streams,
       clients,

diff --git a/benchmark/http2/headers.js b/benchmark/http2/headers.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const common = require('../common.js');
-const PORT = common.PORT;
 
 const bench = common.createBenchmark(main, {
   n: [1e3],
@@ -32,8 +31,8 @@ function main({ n, nheaders }) {
     stream.respond();
     stream.end('Hi!');
   });
-  server.listen(PORT, () => {
-    const client = http2.connect(`http://localhost:${PORT}/`, {
+  server.listen(0, () => {
+    const client = http2.connect(`http://localhost:${server.address().port}/`, {
       maxHeaderListPairs: 20000
     });
 

diff --git a/benchmark/http2/respond-with-fd.js b/benchmark/http2/respond-with-fd.js
@@ -25,10 +25,11 @@ function main({ requests, streams, clients, duration }) {
       stream.respondWithFD(fd);
       stream.on('error', (err) => {});
     });
-    server.listen(common.PORT, () => {
+    server.listen(0, () => {
       bench.http({
         path: '/',
         requests,
+        port: server.address().port,
         maxConcurrentStreams: streams,
         clients,
         duration,

diff --git a/benchmark/http2/simple.js b/benchmark/http2/simple.js
@@ -22,9 +22,10 @@ function main({ requests, streams, clients, duration }) {
     out.pipe(stream);
     stream.on('error', (err) => {});
   });
-  server.listen(common.PORT, () => {
+  server.listen(0, () => {
     bench.http({
       path: '/',
+      port: server.address().port,
       requests,
       maxConcurrentStreams: streams,
       clients,

diff --git a/benchmark/http2/write.js b/benchmark/http2/write.js
@@ -26,9 +26,10 @@ function main({ streams, length, size, duration }) {
     }
     write();
   });
-  server.listen(common.PORT, () => {
+  server.listen(0, () => {
     bench.http({
       path: '/',
+      port: server.address().port,
       requests: 10000,
       duration,
       maxConcurrentStreams: streams,