tools,benchmark: increase lint compliance

In the hopes of soon having the benchmark code linted, this change
groups all the likely non-controversial lint-compliance changes such as
indentation, semi-colon usage, and single-vs.-double quotation marks.
Other lint rules may have subtle performance implications in the V8
currently shipped with Node.js. Those changes will require more careful
review and will be in a separate change.
PR-URL: #5429
Reviewed-By: Roman Reiss <me@silverwind.io>
Reviewed-By: Brian White <mscdex@mscdex.net>

Author: Trott

benchmark/buffers/buffer-bytelength.js

@@ -44,7 +44,7 @@ function main(conf) {
 varr=Buffer.byteLength(strings[index],encoding);
 
 if(r!==results[index])
-throwError('incorrect return value');
+thrownewError('incorrect return value');
 }
 bench.end(n);
 }

benchmark/buffers/buffer-read.js

@@ -22,10 +22,10 @@ function main(conf) {
 
 buff.writeDoubleLE(0,0,noAssert);
 vartestFunction=newFunction('buff',[
-"for (var i = 0; i !== "+len+"; i++) {",
-" buff."+fn+"(0, "+JSON.stringify(noAssert)+");",
-"}"
-].join("\n"));
+'for (var i = 0; i !== '+len+'; i++) {',
+' buff.'+fn+'(0, '+JSON.stringify(noAssert)+');',
+'}'
+].join('\n'));
 bench.start();
 testFunction(buff);
 bench.end(len/1e6);

benchmark/buffers/buffer-write.js

@@ -48,21 +48,21 @@ function main(conf) {
 functionbenchInt(buff,fn,len,noAssert){
 varm=mod[fn];
 vartestFunction=newFunction('buff',[
-"for (var i = 0; i !== "+len+"; i++) {",
-" buff."+fn+"(i & "+m+", 0, "+JSON.stringify(noAssert)+");",
-"}"
-].join("\n"));
+'for (var i = 0; i !== '+len+'; i++) {',
+' buff.'+fn+'(i & '+m+', 0, '+JSON.stringify(noAssert)+');',
+'}'
+].join('\n'));
 bench.start();
 testFunction(buff);
 bench.end(len/1e6);
 }
 
 functionbenchFloat(buff,fn,len,noAssert){
 vartestFunction=newFunction('buff',[
-"for (var i = 0; i !== "+len+"; i++) {",
-" buff."+fn+"(i, 0, "+JSON.stringify(noAssert)+");",
-"}"
-].join("\n"));
+'for (var i = 0; i !== '+len+'; i++) {',
+' buff.'+fn+'(i, 0, '+JSON.stringify(noAssert)+');',
+'}'
+].join('\n'));
 bench.start();
 testFunction(buff);
 bench.end(len/1e6);

benchmark/common.js

@@ -28,7 +28,7 @@ if (module === require.main) {
 vartests=fs.readdirSync(dir);
 
 if(testFilter){
-varfilteredTests=tests.filter(function(item){
+varfilteredTests=tests.filter(function(item){
 if(item.lastIndexOf(testFilter)>=0){
 returnitem;
 }
@@ -49,7 +49,7 @@ function hasWrk() {
 if(result.error&&result.error.code==='ENOENT'){
 console.error('Couldn\'t locate `wrk` which is needed for running '+
 'benchmarks. Check benchmark/README.md for further instructions.');
-process.exit(-1);
+process.exit(-1);
 }
 }
 
@@ -87,7 +87,7 @@ function Benchmark(fn, options) {
 this.options=options;
 this.config=parseOpts(options);
 this._name=require.main.filename.split(/benchmark[\/\\]/).pop();
-this._start=[0,0];
+this._start=[0,0];
 this._started=false;
 
 varself=this;
@@ -121,7 +121,7 @@ Benchmark.prototype.http = function(p, args, cb) {
 
 if(code){
 console.error('wrk failed with '+code);
-process.exit(code)
+process.exit(code);
 }
 varmatch=out.match(regexp);
 varqps=match&&+match[1];
@@ -141,8 +141,6 @@ Benchmark.prototype._run = function() {
 // some options weren't set.
 // run with all combinations
 varmain=require.main.filename;
-varsettings=[];
-varqueueLen=1;
 varoptions=this.options;
 
 varqueue=Object.keys(options).reduce(function(set,key){
@@ -210,7 +208,7 @@ function parseOpts(options) {
 });
 }
 returnnum===0 ? conf : null;
-};
+}
 
 Benchmark.prototype.start=function(){
 if(this._started)
@@ -228,8 +226,8 @@ Benchmark.prototype.end = function(operations) {
 if(typeofoperations!=='number')
 thrownewError('called end() without specifying operation count');
 
-vartime=elapsed[0]+elapsed[1]/1e9;
-varrate=operations/time;
+vartime=elapsed[0]+elapsed[1]/1e9;
+varrate=operations/time;
 this.report(rate);
 };
 

benchmark/crypto/aes-gcm-throughput.js

@@ -31,7 +31,7 @@ function AEAD_Bench(cipher, message, associate_data, key, iv, n, len) {
 varbob=crypto.createDecipheriv(cipher,key,iv);
 bob.setAuthTag(tag);
 bob.setAAD(associate_data);
-varclear=bob.update(enc);
+bob.update(enc);
 bob.final();
 }
 

benchmark/crypto/cipher-stream.js

@@ -96,7 +96,6 @@ function legacyWrite(alice, bob, message, encoding, writes) {
 written+=dec.length;
 dec=bob.final();
 written+=dec.length;
-varbits=written*8;
 vargbits=written/(1024*1024*1024);
 bench.end(gbits);
 }

benchmark/crypto/hash-stream-creation.js

@@ -21,9 +21,6 @@ function main(conf) {
 api='legacy';
 }
 
-varcrypto=require('crypto');
-varassert=require('assert');
-
 varmessage;
 varencoding;
 switch(conf.type){

benchmark/crypto/hash-stream-throughput.js

@@ -20,9 +20,6 @@ function main(conf) {
 api='legacy';
 }
 
-varcrypto=require('crypto');
-varassert=require('assert');
-
 varmessage;
 varencoding;
 switch(conf.type){

benchmark/crypto/rsa-encrypt-decrypt-throughput.js

@@ -23,7 +23,6 @@ var bench = common.createBenchmark(main, {
 });
 
 functionmain(conf){
-varcrypto=require('crypto');
 varmessage=(newBuffer(conf.len)).fill('b');
 
 bench.start();
@@ -39,7 +38,7 @@ function StreamWrite(algo, keylen, message, n, len) {
 varpublicKey=RSA_PublicPem[keylen];
 for(vari=0;i<n;i++){
 varenc=crypto.privateEncrypt(privateKey,message);
-varclear=crypto.publicDecrypt(publicKey,enc);
+crypto.publicDecrypt(publicKey,enc);
 }
 
 bench.end(kbits);

benchmark/crypto/rsa-sign-verify-throughput.js

@@ -24,7 +24,6 @@ var bench = common.createBenchmark(main, {
 });
 
 functionmain(conf){
-varcrypto=require('crypto');
 varmessage=(newBuffer(conf.len)).fill('b');
 
 bench.start();
@@ -37,7 +36,6 @@ function StreamWrite(algo, keylen, message, writes, len) {
 varkbits=bits/(1024);
 
 varprivateKey=RSA_PrivatePem[keylen];
-varpublicKey=RSA_PublicPem[keylen];
 vars=crypto.createSign(algo);
 varv=crypto.createVerify(algo);
 
@@ -46,7 +44,7 @@ function StreamWrite(algo, keylen, message, writes, len) {
 v.update(message);
 }
 
-varsign=s.sign(privateKey,'binary');
+s.sign(privateKey,'binary');
 s.end();
 v.end();