[bench] tests now work

dscape · Dec 20, 2011 · 34f1ae6 · 34f1ae6
1 parent 0b611b7
commit 34f1ae6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/bench/async.js b/bench/async.js
@@ -3,21 +3,22 @@
 
 // node bench/async.js samples/npm.json
 //                    jsonfile         
-console.log('=N("node bench/async.js ' + process.argv[2] + '")');
-console.log('=N("clp (clarinet parser), cls (clarinet event emitter)")');
-console.log('=N("jpp (creationix/jsonparse)")');
-
 var fs         = require('fs')
   , clarinet   = require('../clarinet')
   , Parser     = require('jsonparse')
   , jsonparser
   , p
   , s
   , start
+  , n         = process.argv[3] || 9
   ;
 
+console.log('=N("node bench/async.js ' + process.argv[2] + ' ' + n + '")');
+console.log('=N("clp (clarinet parser), cls (clarinet event emitter)")');
+console.log('=N("jpp (creationix/jsonparse)")');
+
 function stream_bench(cb) {
-  s          = clarinet.createStream()
+  s          = clarinet.createStream();
   s.on('end', function () {
     console.log('cls, %s', Date.now()-start);
     cb();
@@ -29,7 +30,7 @@ function stream_bench(cb) {
 }
 
 function parser_bench(cb) {
-  p          = clarinet.parser()
+  p          = clarinet.parser();
   p.onend = function () { 
     console.log('clp, %s', Date.now()-start);
     cb();
@@ -42,7 +43,7 @@ function parser_bench(cb) {
 }
 
 function jsonparse_bench(cb) {
-  jsonparser = new Parser()
+  jsonparser = new Parser();
   var fs_read = fs.createReadStream(process.argv[2]);
   var buffer  = [];
   var bodyLen = 0;
@@ -60,21 +61,16 @@ function jsonparse_bench(cb) {
     start = Date.now();
     jsonparser.write(body);
     console.log('jpp, %s', Date.now()-start);
+    if(n===0) process.exit();
+    n--;
     setTimeout(repeat,0);
   });
 }
 
 function repeat() {
   stream_bench(function () {
-    return parser_bench(function () { return jsonparse_bench(function(){})})
-  });
+    return parser_bench(function () { return jsonparse_bench(function(){
+  }); }); });
 }
 
-repeat();
-//async.whilst(
-//    function () { return true; },
-//    function (callback) {
-//      var fs = [ stream_bench, parser_bench, jsonparse_bench];
-//      async.series(fs, function() { c(); });
-//    }
-//);
+repeat();
diff --git a/bench/sync.js b/bench/sync.js
@@ -13,11 +13,12 @@ var fs         = require('fs')
   , string     = file.toString()
   , p          = clarinet.parser()
   , s          = clarinet.createStream()
-  , max        = process.argv[3]
+  , max        = process.argv[3] || 1
+  , n          = process.argv[4] || 9
   ;
 
 console.log('=N("node bench/sync.js ' + process.argv[2] + ' ' +
-   process.argv[3] + '")');
+   max + ' ' + n + '")');
 console.log('=N("clp (clarinet parser), cls (clarinet event emitter)")');
 console.log('=N("jpp (creationix/jsonparse), v8s (JSON.parse string)")');
 console.log('=N("v8b (JSON.parse buffer)")');
@@ -29,6 +30,7 @@ while (true) {
     console.log("clp, %s", Date.now()-start);
   } catch (ex1) { }
 
+  // slower
   try {
     start = Date.now();
     for (var i = 0; i < max; i++) s.write(string);
@@ -47,10 +49,13 @@ while (true) {
     console.log("v8s, %s", Date.now()-start);
   } catch (ex3) { }
 
+  // slower
   try {
     start = Date.now();
     for (var i = 0; i < max; i++) JSON.parse(file);
-    console.log("v8b: %s", Date.now()-start);
+    console.log("v8b, %s", Date.now()-start);
   } catch (ex4) { }
 
+  if(n===0) return;
+  n--;
 }