benchmark: use let instead of var

dnlup · codebytere · commit 2de085fe9367 · 2020-02-17T12:48:31.000-08:00
Use `let` in module, napi, net, os, path, process, querystring, streams and string_decoder. PR-URL: #31592 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/benchmark/module/module-loader-deep.js b/benchmark/module/module-loader-deep.js
@@ -37,14 +37,13 @@ function main({ ext, cache, files }) {
 }
 
 function measureDir(cache, files) {
- var i;
 if (cache) {
- for (i = 0; i <= files; i++) {
+ for (let i = 0; i <= files; i++) {
 require(`${benchmarkDirectory}/${i}`);
 }
 }
 bench.start();
- for (i = 0; i <= files; i++) {
+ for (let i = 0; i <= files; i++) {
 require(`${benchmarkDirectory}/${i}`);
 }
 bench.end(files);
diff --git a/benchmark/module/module-loader.js b/benchmark/module/module-loader.js
@@ -42,15 +42,14 @@ function main({ n, name, cache, files, dir }) {
 }
 
 function measureDir(n, cache, files, name) {
- var i;
 if (cache) {
- for (i = 0; i <= files; i++) {
+ for (let i = 0; i <= files; i++) {
 require(`${benchmarkDirectory}${i}${name}`);
 }
 }
 bench.start();
- for (i = 0; i <= files; i++) {
- for (var j = 0; j < n; j++)
+ for (let i = 0; i <= files; i++) {
+ for (let j = 0; j < n; j++)
 require(`${benchmarkDirectory}${i}${name}`);
 // Pretend mixed input (otherwise the results are less representative due to
 // highly specialized code).
diff --git a/benchmark/napi/function_args/index.js b/benchmark/napi/function_args/index.js
@@ -89,7 +89,7 @@ function main({ n, engine, type }) {
 const args = generateArgs(type);
 
 bench.start();
- for (var i = 0; i < n; i++) {
+ for (let i = 0; i < n; i++) {
 fn.apply(null, args);
 }
 bench.end(n);
diff --git a/benchmark/napi/function_call/index.js b/benchmark/napi/function_call/index.js
@@ -29,7 +29,7 @@ try {
 }
 const napi = napi_binding.hello;
 
-var c = 0;
+let c = 0;
 function js() {
 return c++;
 }
@@ -44,7 +44,7 @@ const bench = common.createBenchmark(main, {
 function main({ n, type }) {
 const fn = type === 'cxx' ? cxx : type === 'napi' ? napi : js;
 bench.start();
- for (var i = 0; i < n; i++) {
+ for (let i = 0; i < n; i++) {
 fn();
 }
 bench.end(n);
diff --git a/benchmark/net/net-c2s-cork.js b/benchmark/net/net-c2s-cork.js
@@ -11,8 +11,8 @@ const bench = common.createBenchmark(main, {
 dur: [5],
 });
 
-var chunk;
-var encoding;
+let chunk;
+let encoding;
 
 function main({ dur, len, type }) {
 switch (type) {
diff --git a/benchmark/net/net-c2s.js b/benchmark/net/net-c2s.js
@@ -11,8 +11,8 @@ const bench = common.createBenchmark(main, {
 dur: [5],
 });
 
-var chunk;
-var encoding;
+let chunk;
+let encoding;
 
 function main({ dur, len, type }) {
 switch (type) {
diff --git a/benchmark/net/net-pipe.js b/benchmark/net/net-pipe.js
@@ -11,8 +11,8 @@ const bench = common.createBenchmark(main, {
 dur: [5],
 });
 
-var chunk;
-var encoding;
+let chunk;
+let encoding;
 
 function main({ dur, len, type }) {
 switch (type) {
diff --git a/benchmark/net/net-s2c.js b/benchmark/net/net-s2c.js
@@ -12,10 +12,10 @@ const bench = common.createBenchmark(main, {
 dur: [5]
 });
 
-var chunk;
-var encoding;
-var recvbuf;
-var received = 0;
+let chunk;
+let encoding;
+let recvbuf;
+let received = 0;
 
 function main({ dur, sendchunklen, type, recvbuflen, recvbufgenfn }) {
 if (isFinite(recvbuflen) && recvbuflen > 0)
@@ -38,8 +38,8 @@ function main({ dur, sendchunklen, type, recvbuflen, recvbufgenfn }) {
 }
 
 const reader = new Reader();
- var writer;
- var socketOpts;
+ let writer;
+ let socketOpts;
 if (recvbuf === undefined) {
 writer = new Writer();
 socketOpts = { port: PORT };
diff --git a/benchmark/net/net-wrap-js-stream-passthrough.js b/benchmark/net/net-wrap-js-stream-passthrough.js
@@ -12,8 +12,8 @@ const bench = common.createBenchmark(main, {
 flags: ['--expose-internals']
 });
 
-var chunk;
-var encoding;
+let chunk;
+let encoding;
 
 function main({ dur, len, type }) {
 // Can only require internals inside main().
diff --git a/benchmark/net/tcp-raw-c2s.js b/benchmark/net/tcp-raw-c2s.js
@@ -24,7 +24,7 @@ function main({ dur, len, type }) {
 const PORT = common.PORT;
 
 const serverHandle = new TCP(TCPConstants.SERVER);
- var err = serverHandle.bind('127.0.0.1', PORT);
+ let err = serverHandle.bind('127.0.0.1', PORT);
 if (err)
 fail(err, 'bind');
 
@@ -38,7 +38,7 @@ function main({ dur, len, type }) {
 
 // The meat of the benchmark is right here:
 bench.start();
- var bytes = 0;
+ let bytes = 0;
 
 setTimeout(() => {
 // report in Gb/sec
@@ -67,7 +67,7 @@ function main({ dur, len, type }) {
 }
 
 function client(type, len) {
- var chunk;
+ let chunk;
 switch (type) {
 case 'buf':
 chunk = Buffer.alloc(len, 'x');
@@ -102,7 +102,7 @@ function main({ dur, len, type }) {
 function write() {
 const writeReq = new WriteWrap();
 writeReq.oncomplete = afterWrite;
- var err;
+ let err;
 switch (type) {
 case 'buf':
 err = clientHandle.writeBuffer(writeReq, chunk);
diff --git a/benchmark/net/tcp-raw-pipe.js b/benchmark/net/tcp-raw-pipe.js
@@ -31,7 +31,7 @@ function main({ dur, len, type }) {
 
 // Server
 const serverHandle = new TCP(TCPConstants.SERVER);
- var err = serverHandle.bind('127.0.0.1', PORT);
+ let err = serverHandle.bind('127.0.0.1', PORT);
 if (err)
 fail(err, 'bind');
 
@@ -66,7 +66,7 @@ function main({ dur, len, type }) {
 };
 
 // Client
- var chunk;
+ let chunk;
 switch (type) {
 case 'buf':
 chunk = Buffer.alloc(len, 'x');
@@ -83,7 +83,7 @@ function main({ dur, len, type }) {
 
 const clientHandle = new TCP(TCPConstants.SOCKET);
 const connectReq = new TCPConnectWrap();
- var bytes = 0;
+ let bytes = 0;
 
 err = clientHandle.connect(connectReq, '127.0.0.1', PORT);
 if (err)
@@ -118,7 +118,7 @@ function main({ dur, len, type }) {
 function write() {
 const writeReq = new WriteWrap();
 writeReq.oncomplete = afterWrite;
- var err;
+ let err;
 switch (type) {
 case 'buf':
 err = clientHandle.writeBuffer(writeReq, chunk);
diff --git a/benchmark/net/tcp-raw-s2c.js b/benchmark/net/tcp-raw-s2c.js
@@ -26,7 +26,7 @@ function main({ dur, len, type }) {
 const PORT = common.PORT;
 
 const serverHandle = new TCP(TCPConstants.SERVER);
- var err = serverHandle.bind('127.0.0.1', PORT);
+ let err = serverHandle.bind('127.0.0.1', PORT);
 if (err)
 fail(err, 'bind');
 
@@ -38,7 +38,7 @@ function main({ dur, len, type }) {
 if (err)
 fail(err, 'connect');
 
- var chunk;
+ let chunk;
 switch (type) {
 case 'buf':
 chunk = Buffer.alloc(len, 'x');
@@ -62,7 +62,7 @@ function main({ dur, len, type }) {
 const writeReq = new WriteWrap();
 writeReq.async = false;
 writeReq.oncomplete = afterWrite;
- var err;
+ let err;
 switch (type) {
 case 'buf':
 err = clientHandle.writeBuffer(writeReq, chunk);
@@ -108,7 +108,7 @@ function main({ dur, len, type }) {
 fail(err, 'connect');
 
 connectReq.oncomplete = function() {
- var bytes = 0;
+ let bytes = 0;
 clientHandle.onread = function(buffer) {
 // We're not expecting to ever get an EOF from the client.
 // Just lots of data forever.
diff --git a/benchmark/path/basename-posix.js b/benchmark/path/basename-posix.js
@@ -19,7 +19,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n, pathext }) {
- var ext;
+ let ext;
 const extIdx = pathext.indexOf('|');
 if (extIdx !== -1) {
 ext = pathext.slice(extIdx + 1);
diff --git a/benchmark/path/basename-win32.js b/benchmark/path/basename-win32.js
@@ -19,7 +19,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n, pathext }) {
- var ext;
+ let ext;
 const extIdx = pathext.indexOf('|');
 if (extIdx !== -1) {
 ext = pathext.slice(extIdx + 1);
diff --git a/benchmark/path/relative-posix.js b/benchmark/path/relative-posix.js
@@ -16,7 +16,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n, paths }) {
- var to = '';
+ let to = '';
 const delimIdx = paths.indexOf('|');
 if (delimIdx > -1) {
 to = paths.slice(delimIdx + 1);
diff --git a/benchmark/path/relative-win32.js b/benchmark/path/relative-win32.js
@@ -14,7 +14,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n, paths }) {
- var to = '';
+ let to = '';
 const delimIdx = paths.indexOf('|');
 if (delimIdx > -1) {
 to = paths.slice(delimIdx + 1);
diff --git a/benchmark/process/bench-hrtime.js b/benchmark/process/bench-hrtime.js
@@ -10,27 +10,26 @@ const bench = common.createBenchmark(main, {
 
 function main({ n, type }) {
 const hrtime = process.hrtime;
- var noDead = type === 'bigint' ? hrtime.bigint() : hrtime();
- var i;
+ let noDead = type === 'bigint' ? hrtime.bigint() : hrtime();
 
 switch (type) {
 case 'raw':
 bench.start();
- for (i = 0; i < n; i++) {
+ for (let i = 0; i < n; i++) {
 noDead = hrtime();
 }
 bench.end(n);
 break;
 case 'diff':
 bench.start();
- for (i = 0; i < n; i++) {
+ for (let i = 0; i < n; i++) {
 noDead = hrtime(noDead);
 }
 bench.end(n);
 break;
 case 'bigint':
 bench.start();
- for (i = 0; i < n; i++) {
+ for (let i = 0; i < n; i++) {
 noDead = hrtime.bigint();
 }
 bench.end(n);
diff --git a/benchmark/process/next-tick-breadth-args.js b/benchmark/process/next-tick-breadth-args.js
@@ -6,7 +6,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n }) {
- var j = 0;
+ let j = 0;
 
 function cb1(arg1) {
 j++;
diff --git a/benchmark/process/next-tick-breadth.js b/benchmark/process/next-tick-breadth.js
@@ -6,7 +6,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n }) {
- var j = 0;
+ let j = 0;
 
 function cb() {
 j++;
diff --git a/benchmark/process/queue-microtask-breadth.js b/benchmark/process/queue-microtask-breadth.js
@@ -6,7 +6,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n }) {
- var j = 0;
+ let j = 0;
 
 function cb() {
 j++;
diff --git a/benchmark/querystring/querystring-parse.js b/benchmark/querystring/querystring-parse.js
@@ -10,23 +10,23 @@ const bench = common.createBenchmark(main, {
 
 function main({ type, n }) {
 const input = inputs[type];
- var i;
+
 // Execute the function a "sufficient" number of times before the timed
 // loop to ensure the function is optimized just once.
 if (type === 'multicharsep') {
- for (i = 0; i < n; i += 1)
+ for (let i = 0; i < n; i += 1)
 querystring.parse(input, '&&&&&&&&&&');
 
 bench.start();
- for (i = 0; i < n; i += 1)
+ for (let i = 0; i < n; i += 1)
 querystring.parse(input, '&&&&&&&&&&');
 bench.end(n);
 } else {
- for (i = 0; i < n; i += 1)
+ for (let i = 0; i < n; i += 1)
 querystring.parse(input);
 
 bench.start();
- for (i = 0; i < n; i += 1)
+ for (let i = 0; i < n; i += 1)
 querystring.parse(input);
 bench.end(n);
 }
diff --git a/benchmark/streams/creation.js b/benchmark/streams/creation.js
diff --git a/benchmark/streams/pipe-object-mode.js b/benchmark/streams/pipe-object-mode.js
diff --git a/benchmark/streams/pipe.js b/benchmark/streams/pipe.js
diff --git a/benchmark/streams/readable-bigread.js b/benchmark/streams/readable-bigread.js
diff --git a/benchmark/streams/readable-bigunevenread.js b/benchmark/streams/readable-bigunevenread.js
diff --git a/benchmark/streams/readable-boundaryread.js b/benchmark/streams/readable-boundaryread.js
diff --git a/benchmark/streams/readable-readall.js b/benchmark/streams/readable-readall.js
diff --git a/benchmark/streams/readable-unevenread.js b/benchmark/streams/readable-unevenread.js
diff --git a/benchmark/string_decoder/string-decoder.js b/benchmark/string_decoder/string-decoder.js

Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,13 @@ function main({ ext, cache, files }) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`functionmeasureDir(cache,files){`
`40`		`-vari;`
`41`	`40`	`if(cache){`
`42`		`-for(i=0;i<=files;i++){`
	`41`	`+for(leti=0;i<=files;i++){`
`43`	`42`	require(`${benchmarkDirectory}/${i}`);
`44`	`43`	`}`
`45`	`44`	`}`
`46`	`45`	`bench.start();`
`47`		`-for(i=0;i<=files;i++){`
	`46`	`+for(leti=0;i<=files;i++){`
`48`	`47`	require(`${benchmarkDirectory}/${i}`);
`49`	`48`	`}`
`50`	`49`	`bench.end(files);`
Original file line number	Diff line number	Diff line change
`@@ -42,15 +42,14 @@ function main({ n, name, cache, files, dir }) {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`functionmeasureDir(n,cache,files,name){`
`45`		`-vari;`
`46`	`45`	`if(cache){`
`47`		`-for(i=0;i<=files;i++){`
	`46`	`+for(leti=0;i<=files;i++){`
`48`	`47`	require(`${benchmarkDirectory}${i}${name}`);
`49`	`48`	`}`
`50`	`49`	`}`
`51`	`50`	`bench.start();`
`52`		`-for(i=0;i<=files;i++){`
`53`		`-for(varj=0;j<n;j++)`
	`51`	`+for(leti=0;i<=files;i++){`
	`52`	`+for(letj=0;j<n;j++)`
`54`	`53`	require(`${benchmarkDirectory}${i}${name}`);
`55`	`54`	`// Pretend mixed input (otherwise the results are less representative due to`
`56`	`55`	`// highly specialized code).`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ function main({ n, engine, type }) {`
`89`	`89`	`constargs=generateArgs(type);`
`90`	`90`
`91`	`91`	`bench.start();`
`92`		`-for(vari=0;i<n;i++){`
	`92`	`+for(leti=0;i<n;i++){`
`93`	`93`	`fn.apply(null,args);`
`94`	`94`	`}`
`95`	`95`	`bench.end(n);`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ try {`
`29`	`29`	`}`
`30`	`30`	`constnapi=napi_binding.hello;`
`31`	`31`
`32`		`-varc=0;`
	`32`	`+letc=0;`
`33`	`33`	`functionjs(){`
`34`	`34`	`returnc++;`
`35`	`35`	`}`
`@@ -44,7 +44,7 @@ const bench = common.createBenchmark(main, {`
`44`	`44`	`functionmain({ n, type }){`
`45`	`45`	`constfn=type==='cxx' ? cxx : type==='napi' ? napi : js;`
`46`	`46`	`bench.start();`
`47`		`-for(vari=0;i<n;i++){`
	`47`	`+for(leti=0;i<n;i++){`
`48`	`48`	`fn();`
`49`	`49`	`}`
`50`	`50`	`bench.end(n);`
-Original file line number
+Diff line change
 dur: [5],
 });
 -varchunk;
 -varencoding;
 +letchunk;
 +letencoding;
 functionmain({ dur, len, type }){
 switch(type){
-Original file line number
+Diff line change
 dur: [5]
 });
 -varchunk;
 -varencoding;
 -varrecvbuf;
 -varreceived=0;
 +letchunk;
 +letencoding;
 +letrecvbuf;
 +letreceived=0;
 functionmain({ dur, sendchunklen, type, recvbuflen, recvbufgenfn }){
 if(isFinite(recvbuflen)&&recvbuflen>0)
+}
 constreader=newReader();
 -varwriter;
 -varsocketOpts;
 +letwriter;
 +letsocketOpts;
 if(recvbuf===undefined){
 writer=newWriter();
 socketOpts={port: PORT};
-Original file line number
+Diff line change
 constPORT=common.PORT;
 constserverHandle=newTCP(TCPConstants.SERVER);
 -varerr=serverHandle.bind('127.0.0.1',PORT);
 +leterr=serverHandle.bind('127.0.0.1',PORT);
 if(err)
 fail(err,'bind');
 // The meat of the benchmark is right here:
 bench.start();
 -varbytes=0;
 +letbytes=0;
 setTimeout(()=>{
 // report in Gb/sec
+}
 functionclient(type,len){
 -varchunk;
 +letchunk;
 switch(type){
 case'buf':
 chunk=Buffer.alloc(len,'x');
 functionwrite(){
 constwriteReq=newWriteWrap();
 writeReq.oncomplete=afterWrite;
 -varerr;
 +leterr;
 switch(type){
 case'buf':
 err=clientHandle.writeBuffer(writeReq,chunk);