From 4e19cbef86897059429e06e45773dd2226821f16 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Sat, 30 Dec 2017 03:57:46 +0100 Subject: [PATCH] benchmark: (http) use destructuring PR-URL: https://github.com/nodejs/node/pull/18250 Reviewed-By: Matteo Collina Reviewed-By: James M Snell --- benchmark/http/_chunky_http_client.js | 6 ++---- benchmark/http/bench-parser.js | 4 +--- benchmark/http/check_invalid_header_char.js | 5 +---- benchmark/http/check_is_http_token.js | 5 +---- benchmark/http/chunked.js | 8 ++++---- benchmark/http/client-request-body.js | 9 +++------ benchmark/http/cluster.js | 6 +++--- benchmark/http/create-clientrequest.js | 5 +---- benchmark/http/end-vs-write-end.js | 11 +++++------ benchmark/http/simple.js | 7 +++---- 10 files changed, 24 insertions(+), 42 deletions(-) diff --git a/benchmark/http/_chunky_http_client.js b/benchmark/http/_chunky_http_client.js index ee1f4f8caa2510..a90535e489f4c9 100644 --- a/benchmark/http/_chunky_http_client.js +++ b/benchmark/http/_chunky_http_client.js @@ -11,9 +11,7 @@ const bench = common.createBenchmark(main, { }); -function main(conf) { - const len = +conf.len; - const num = +conf.n; +function main({ len, n }) { var todo = []; const headers = []; // Chose 7 because 9 showed "Connection error" / "Connection closed" @@ -78,7 +76,7 @@ function main(conf) { size = (size * mult + add) % mod; if (did) { count += 1; - if (count === num) { + if (count === n) { bench.end(count); process.exit(0); } else { diff --git a/benchmark/http/bench-parser.js b/benchmark/http/bench-parser.js index 1bc661e7289168..4c691d71345da3 100644 --- a/benchmark/http/bench-parser.js +++ b/benchmark/http/bench-parser.js @@ -15,9 +15,7 @@ const bench = common.createBenchmark(main, { }); -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++) { diff --git a/benchmark/http/check_invalid_header_char.js b/benchmark/http/check_invalid_header_char.js index d71bc6fc607ef5..b9933d690e25cc 100644 --- a/benchmark/http/check_invalid_header_char.js +++ b/benchmark/http/check_invalid_header_char.js @@ -30,10 +30,7 @@ const bench = common.createBenchmark(main, { n: [1e6], }); -function main(conf) { - const n = +conf.n; - const key = conf.key; - +function main({ n, key }) { bench.start(); for (var i = 0; i < n; i++) { _checkInvalidHeaderChar(key); diff --git a/benchmark/http/check_is_http_token.js b/benchmark/http/check_is_http_token.js index 92df3445b45c45..c16993819be93b 100644 --- a/benchmark/http/check_is_http_token.js +++ b/benchmark/http/check_is_http_token.js @@ -40,10 +40,7 @@ const bench = common.createBenchmark(main, { n: [1e6], }); -function main(conf) { - const n = +conf.n; - const key = conf.key; - +function main({ n, key }) { bench.start(); for (var i = 0; i < n; i++) { _checkIsHttpToken(key); diff --git a/benchmark/http/chunked.js b/benchmark/http/chunked.js index 1056f456ef827d..5615395ee0b175 100644 --- a/benchmark/http/chunked.js +++ b/benchmark/http/chunked.js @@ -16,9 +16,9 @@ const bench = common.createBenchmark(main, { c: [100] }); -function main(conf) { +function main({ len, n, c }) { const http = require('http'); - const chunk = Buffer.alloc(conf.len, '8'); + const chunk = Buffer.alloc(len, '8'); const server = http.createServer(function(req, res) { function send(left) { @@ -28,12 +28,12 @@ function main(conf) { send(left - 1); }, 0); } - send(conf.n); + send(n); }); server.listen(common.PORT, function() { bench.http({ - connections: conf.c + connections: c }, function() { server.close(); }); diff --git a/benchmark/http/client-request-body.js b/benchmark/http/client-request-body.js index a6849580cfb44d..49bb9130ae3a8a 100644 --- a/benchmark/http/client-request-body.js +++ b/benchmark/http/client-request-body.js @@ -11,13 +11,10 @@ const bench = common.createBenchmark(main, { method: ['write', 'end'] }); -function main(conf) { - const dur = +conf.dur; - const len = +conf.len; - +function main({ dur, len, type, method }) { var encoding; var chunk; - switch (conf.type) { + switch (type) { case 'buf': chunk = Buffer.alloc(len, 'x'); break; @@ -55,7 +52,7 @@ function main(conf) { pummel(); // Line up next request. res.resume(); }); - if (conf.method === 'write') { + if (method === 'write') { req.write(chunk, encoding); req.end(); } else { diff --git a/benchmark/http/cluster.js b/benchmark/http/cluster.js index 352b1d2645008f..56393fa1ab0518 100644 --- a/benchmark/http/cluster.js +++ b/benchmark/http/cluster.js @@ -15,7 +15,7 @@ if (cluster.isMaster) { require('../fixtures/simple-http-server.js').listen(port); } -function main(conf) { +function main({ type, len, c }) { process.env.PORT = PORT; var workers = 0; const w1 = cluster.fork(); @@ -27,11 +27,11 @@ function main(conf) { return; setTimeout(function() { - const path = `/${conf.type}/${conf.len}`; + const path = `/${type}/${len}`; bench.http({ path: path, - connections: conf.c + connections: c }, function() { w1.destroy(); w2.destroy(); diff --git a/benchmark/http/create-clientrequest.js b/benchmark/http/create-clientrequest.js index d19a6fb43441ce..97316a7e800419 100644 --- a/benchmark/http/create-clientrequest.js +++ b/benchmark/http/create-clientrequest.js @@ -8,10 +8,7 @@ const bench = common.createBenchmark(main, { n: [1e6] }); -function main(conf) { - const len = +conf.len; - const n = +conf.n; - +function main({ len, n }) { const path = '/'.repeat(len); const opts = { path: path, createConnection: function() {} }; diff --git a/benchmark/http/end-vs-write-end.js b/benchmark/http/end-vs-write-end.js index b7db1eaa7839e2..f839e5c3cd9ed9 100644 --- a/benchmark/http/end-vs-write-end.js +++ b/benchmark/http/end-vs-write-end.js @@ -17,11 +17,10 @@ const bench = common.createBenchmark(main, { method: ['write', 'end'] }); -function main(conf) { +function main({ len, type, method, c }) { const http = require('http'); var chunk; - const len = conf.len; - switch (conf.type) { + switch (type) { case 'buf': chunk = Buffer.alloc(len, 'x'); break; @@ -42,15 +41,15 @@ function main(conf) { res.end(chunk); } - const method = conf.method === 'write' ? write : end; + const fn = method === 'write' ? write : end; const server = http.createServer(function(req, res) { - method(res); + fn(res); }); server.listen(common.PORT, function() { bench.http({ - connections: conf.c + connections: c }, function() { server.close(); }); diff --git a/benchmark/http/simple.js b/benchmark/http/simple.js index 544aad49688386..d5351815fc1b7e 100644 --- a/benchmark/http/simple.js +++ b/benchmark/http/simple.js @@ -12,17 +12,16 @@ const bench = common.createBenchmark(main, { res: ['normal', 'setHeader', 'setHeaderWH'] }); -function main(conf) { +function main({ type, len, chunks, c, chunkedEnc, res }) { process.env.PORT = PORT; var server = require('../fixtures/simple-http-server.js') .listen(PORT) .on('listening', function() { - const path = - `/${conf.type}/${conf.len}/${conf.chunks}/${conf.res}/${conf.chunkedEnc}`; + const path = `/${type}/${len}/${chunks}/${res}/${chunkedEnc}`; bench.http({ path: path, - connections: conf.c + connections: c }, function() { server.close(); });