2 files changed, 48 insertions, 72 deletions
diff --git a/benchmark/fs-readfile.js b/benchmark/fs-readfile.js
deleted file mode 100644
index 3aa72e1a45..0000000000
--- a/benchmark/fs-readfile.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// Call fs.readFile over and over again really fast.
-// Then see how many times it got called.
-// Yes, this is a silly benchmark.  Most benchmarks are silly.
-
-var path = require('path');
-var filename = path.resolve(__dirname, 'http.sh');
-var fs = require('fs');
-var count = 0;
-var go = true;
-var len = -1;
-var assert = require('assert');
-
-var concurrency = 1;
-var encoding = null;
-var time = 10;
-
-for (var i = 2; i < process.argv.length; i++) {
-  var arg = process.argv[i];
-  if (arg.match(/^-e$/)) {
-    encoding = process.argv[++i] || null;
-  } else if (arg.match(/^-c$/)) {
-    concurrency = ~~process.argv[++i];
-    if (concurrency < 1) concurrency = 1;
-  } else if (arg === '-t') {
-    time = ~~process.argv[++i];
-    if (time < 1) time = 1;
-  }
-}
-
-
-setTimeout(function() {
-  go = false;
-}, time * 1000);
-
-function round(n) {
-  return Math.floor(n * 100) / 100;
-}
-
-var start = process.hrtime();
-while (concurrency--) readFile();
-
-function readFile() {
-  if (!go) {
-    process.stdout.write('\n');
-    console.log('read the file %d times (higher is better)', count);
-    var end = process.hrtime();
-    var elapsed = [end[0] - start[0], end[1] - start[1]];
-    var ns = elapsed[0] * 1E9 + elapsed[1];
-    var nsper = round(ns / count);
-    console.log('%d ns per read (lower is better)', nsper);
-    var readsper = round(count / (ns / 1E9));
-    console.log('%d reads per sec (higher is better)', readsper);
-    process.exit(0);
-    return;
-  }
-
-  if (!(count % 1000)) {
-    process.stdout.write('.');
-  }
-
-  if (encoding) fs.readFile(filename, encoding, then);
-  else fs.readFile(filename, then);
-
-  function then(er, data) {
-    assert.ifError(er);
-    count++;
-    // basic sanity test: we should get the same number of bytes each time.
-    if (count === 1) len = data.length;
-    else assert(len === data.length);
-    readFile();
-  }
-}
diff --git a/benchmark/fs/readfile.js b/benchmark/fs/readfile.js
new file mode 100644
index 0000000000..38548ef647
--- /dev/null
+++ b/benchmark/fs/readfile.js
@@ -0,0 +1,48 @@
+// Call fs.readFile over and over again really fast.
+// Then see how many times it got called.
+// Yes, this is a silly benchmark.  Most benchmarks are silly.
+
+var path = require('path');
+var common = require('../common.js');
+var filename = path.resolve(__dirname, '.removeme-benchmark-garbage');
+var fs = require('fs');
+
+var bench = common.createBenchmark(main, {
+  dur: [1, 3],
+  len: [1024, 16 * 1024 * 1024],
+  concurrent: [1, 10]
+});
+
+function main(conf) {
+  var len = +conf.len;
+  try { fs.unlinkSync(filename); } catch (e) {}
+  var data = new Buffer(len);
+  data.fill('x');
+  fs.writeFileSync(filename, data);
+  data = null;
+
+  var reads = 0;
+  bench.start();
+  setTimeout(function() {
+    bench.end(reads);
+    try { fs.unlinkSync(filename); } catch (e) {}
+  }, +conf.dur * 1000);
+
+  function read() {
+    fs.readFile(filename, afterRead);
+  }
+
+  function afterRead(er, data) {
+    if (er)
+      throw er;
+
+    if (data.length !== len)
+      throw new Error('wrong number of bytes returned');
+
+    reads++;
+    read();
+  }
+
+  var cur = +conf.concurrent;
+  while (cur--) read();
+}