1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

benchmark: add output format option [csv]

Browse Source 
This commit adds an `OUTPUT_FORMAT` environment variable option for
all benchmark tests that allow either 'csv' or 'default' output. Default
output has been left unchanged, and csv output prints out the csv
headers along with the csv formatted per-test output, each test also
seperated by a newline.

It can be used like the following:
$ OUTPUT_FORMAT=csv iojs benchmark/common.js http

Not specifying the OUTPUT_FORMAT env var will default to 'default'.
Specifying a bad value will throw an error.

PR-URL: https://github.com/iojs/io.js/pull/777
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Brendan Ashworth 2015-02-09 19:36:52 -08:00
parent 97d8d4928d
commit c638dad567
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
benchmark/common.js
View File

@ -3,7 +3,14 @@ var fs = require('fs');
var path = require('path'); var path = require('path');
var child_process = require('child_process'); var child_process = require('child_process');
var silent = +process.env.NODE_BENCH_SILENT; var outputFormat = process.env.OUTPUT_FORMAT ||
(+process.env.NODE_BENCH_SILENT ? 'silent' : false) ||
'default';
// verify outputFormat
if (['default', 'csv', 'silent'].indexOf(outputFormat) == -1) {
throw new Error('OUTPUT_FORMAT set to invalid value');
}
exports.PORT = process.env.PORT || 12346; exports.PORT = process.env.PORT || 12346;
@ -54,7 +61,9 @@ function runBenchmarks() {
if (test.match(/^[\._]/)) if (test.match(/^[\._]/))
return process.nextTick(runBenchmarks); return process.nextTick(runBenchmarks);
console.error(type + '/' + test); if (outputFormat == 'default')
console.error(type + '/' + test);
test = path.resolve(dir, test); test = path.resolve(dir, test);
var a = (process.execArgv || []).concat(test); var a = (process.execArgv || []).concat(test);
@ -151,6 +160,10 @@ Benchmark.prototype._run = function() {
return newSet; return newSet;
}, [[main]]); }, [[main]]);
// output csv heading
if (outputFormat == 'csv')
console.log('filename,' + Object.keys(options).join(',') + ',result');
var node = process.execPath; var node = process.execPath;
var i = 0; var i = 0;
function run() { function run() {
@ -216,15 +229,25 @@ Benchmark.prototype.end = function(operations) {
Benchmark.prototype.report = function(value) { Benchmark.prototype.report = function(value) {
var heading = this.getHeading(); var heading = this.getHeading();
if (!silent)
if (outputFormat == 'default')
console.log('%s: %s', heading, value.toFixed(5)); console.log('%s: %s', heading, value.toFixed(5));
else if (outputFormat == 'csv')
console.log('%s,%s', heading, value.toFixed(5));
process.exit(0); process.exit(0);
}; };
Benchmark.prototype.getHeading = function() { Benchmark.prototype.getHeading = function() {
var conf = this.config; var conf = this.config;
return this._name + ' ' + Object.keys(conf).map(function(key) {
return key + '=' + conf[key]; if (outputFormat == 'default') {
}).join(' '); return this._name + ' ' + Object.keys(conf).map(function(key) {
return key + '=' + conf[key];
}).join(' ');
} else if (outputFormat == 'csv') {
return this._name + ',' + Object.keys(conf).map(function(key) {
return conf[key];
}).join(',');
}
}; };