benchmark: (http(2)) refactor

PR-URL: nodejs#18320 Reviewed-By: James M Snell <jasnell@gmail.com>
ryzokuken · Jun 6, 2018 · 8a97757 · 8a97757
1 parent cf8a4af
commit 8a97757
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 16 deletions.
diff --git a/benchmark/http/bench-parser.js b/benchmark/http/bench-parser.js
@@ -14,10 +14,7 @@ const bench = common.createBenchmark(main, {
   n: [1e5],
 });
 
-
-function main(conf) {
-  const len = conf.len >>> 0;
-  const n = conf.n >>> 0;
+function main({ len, n }) {
   var header = `GET /hello HTTP/1.1${CRLF}Content-Type: text/plain${CRLF}`;
 
   for (var i = 0; i < len; i++) {
@@ -28,7 +25,6 @@ function main(conf) {
   processHeader(Buffer.from(header), n);
 }
 
-
 function processHeader(header, n) {
   const parser = newParser(REQUEST);
 
@@ -40,7 +36,6 @@ function processHeader(header, n) {
   bench.end(n);
 }
 
-
 function newParser(type) {
   const parser = new HTTPParser(type);
 

diff --git a/benchmark/http/simple.js b/benchmark/http/simple.js
@@ -1,6 +1,5 @@
 'use strict';
 const common = require('../common.js');
-const PORT = common.PORT;
 
 const bench = common.createBenchmark(main, {
   // unicode confuses ab on os x.
@@ -15,7 +14,7 @@ const bench = common.createBenchmark(main, {
 function main(conf) {
   process.env.PORT = PORT;
   var server = require('../fixtures/simple-http-server.js')
-  .listen(PORT)
+  .listen(common.PORT)
   .on('listening', function() {
     const path =
       `/${conf.type}/${conf.len}/${conf.chunks}/${conf.res}/${conf.chunkedEnc}`;

diff --git a/benchmark/http/upgrade.js b/benchmark/http/upgrade.js
@@ -0,0 +1,51 @@
+'use strict';
+
+const common = require('../common.js');
+const net = require('net');
+
+const bench = common.createBenchmark(main, {
+  n: [5, 1000]
+});
+
+const reqData = 'GET / HTTP/1.1\r\n' +
+                'Upgrade: WebSocket\r\n' +
+                'Connection: Upgrade\r\n' +
+                '\r\n' +
+                'WjN}|M(6';
+
+const resData = 'HTTP/1.1 101 Web Socket Protocol Handshake\r\n' +
+                'Upgrade: WebSocket\r\n' +
+                'Connection: Upgrade\r\n' +
+                '\r\n\r\n';
+
+function main({ n }) {
+  var server = require('../fixtures/simple-http-server.js')
+    .listen(common.PORT)
+    .on('listening', function() {
+      bench.start();
+      doBench(server.address(), n, function() {
+        bench.end(n);
+        server.close();
+      });
+    })
+    .on('upgrade', function(req, socket, upgradeHead) {
+      socket.resume();
+      socket.write(resData);
+      socket.end();
+    });
+}
+
+function doBench(address, count, done) {
+  if (count === 0) {
+    done();
+    return;
+  }
+
+  const conn = net.createConnection(address.port);
+  conn.write(reqData);
+  conn.resume();
+
+  conn.on('end', function() {
+    doBench(address, count - 1, done);
+  });
+}
diff --git a/benchmark/http2/respond-with-fd.js b/benchmark/http2/respond-with-fd.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const common = require('../common.js');
-const PORT = common.PORT;
 const path = require('path');
 const fs = require('fs');
 
@@ -29,7 +28,7 @@ function main(conf) {
       stream.respondWithFD(fd);
       stream.on('error', (err) => {});
     });
-    server.listen(PORT, () => {
+    server.listen(common.PORT, () => {
       bench.http({
         path: '/',
         requests: n,

diff --git a/benchmark/http2/simple.js b/benchmark/http2/simple.js
@@ -1,11 +1,8 @@
 'use strict';
 
 const common = require('../common.js');
-const PORT = common.PORT;
-
 const path = require('path');
 const fs = require('fs');
-
 const file = path.join(path.resolve(__dirname, '../fixtures'), 'alice.html');
 
 const bench = common.createBenchmark(main, {
@@ -27,7 +24,7 @@ function main(conf) {
     out.pipe(stream);
     stream.on('error', (err) => {});
   });
-  server.listen(PORT, () => {
+  server.listen(common.PORT, () => {
     bench.http({
       path: '/',
       requests: n,

diff --git a/benchmark/http2/write.js b/benchmark/http2/write.js
@@ -1,7 +1,6 @@
 'use strict';
 
 const common = require('../common.js');
-const PORT = common.PORT;
 
 const bench = common.createBenchmark(main, {
   streams: [100, 200, 1000],
@@ -29,7 +28,7 @@ function main(conf) {
     }
     write();
   });
-  server.listen(PORT, () => {
+  server.listen(common.PORT, () => {
     bench.http({
       path: '/',
       requests: 10000,