switch to benchmarx

carlos8f · Aug 29, 2012 · 7a6bcbc · 7a6bcbc
1 parent c215181
commit 7a6bcbc
Show file tree

Hide file tree

Showing 26 changed files with 134 additions and 275 deletions.
diff --git a/Makefile b/Makefile
@@ -3,17 +3,12 @@ test:
 		--reporter spec \
 		--timeout 5s
 
-bench: install-bench
-	@node bench
-
-check =										\
-	if [ -z `which siege` ]; then						\
-		echo "please install siege. http://www.joedog.org/siege-home/";	\
-		exit 1;								\
-	fi
-
-install-bench:
-	@$(call check)
+bench:
 	@cd bench; npm install
+	@./node_modules/.bin/benchmarx \
+	  --title "buffet benchmarks" \
+		--runner siege \
+		--opts bench/opts.json \
+		--path ",hello.txt,folder/Alice-white-rabbit.jpg"
 
 .PHONY: test bench
diff --git a/README.md b/README.md
@@ -97,8 +97,9 @@ Running your own benchmark
 Type `make bench` in the buffet directory (you'll need
 [siege](http://www.joedog.org/siege-home/) installed).
 
-For [here](https://github.com/carlos8f/node-buffet/tree/master/bench) for the
-benchmark source code and [here](https://gist.github.com/3473500) for my results.
+Brought to you by [benchmarx](https://github.com/carlos8f/node-benchmarx).
+
+See [here](https://gist.github.com/3473500) for my results.
 
 - - -
 

diff --git a/bench/README.md b/bench/README.md
@@ -14,14 +14,6 @@ In the buffet root, run:
 $ make bench
 ```
 
-Or to run a specific benchmark,
-
-```bash
-$ node bench <module> [time] [wait]
-```
-
-Time defaults to `30` (seconds), and `wait` to `10` (seconds) between tests.
-
 My results
 ----------
 

diff --git a/bench/buffet-server.js b/bench/buffet-server.js
@@ -0,0 +1,27 @@
+var execFile = require('child_process').execFile
+  , utils = require('./lib/utils')
+  , buffet
+
+exports.name = 'buffet-server';
+exports.version = utils.version(exports.name);
+
+exports.listen = function (options, cb) {
+  var port = randomPort()
+    , buffetRoot = utils.resolve(__dirname, '..')
+
+  console.log(options);
+  buffet = execFile(buffetRoot + '/bin/buffet.js', ['-p', port, '--no-log', '--no-watch'], {cwd: options.root});
+  buffet.stderr.on('data', function (chunk) {
+    if (chunk.toString().match(/listening/)) {
+      cb(null, port);
+    }
+  });
+};
+
+exports.close = function () {
+  buffet.kill();
+};
+
+function randomPort () {
+  return Math.round((Math.random() * 2e4) + 2e4);
+}
diff --git a/bench/buffet.js b/bench/buffet.js
@@ -0,0 +1,8 @@
+var utils = require('./lib/utils')
+
+exports.name = 'buffet';
+exports.version = utils.version(exports.name);
+
+exports.middleware = function (options) {
+  return require('../')(options.root);
+};
diff --git a/bench/ecstatic.js b/bench/ecstatic.js
@@ -0,0 +1,8 @@
+var utils = require('./lib/utils')
+
+exports.name = 'ecstatic';
+exports.version = utils.version(exports.name);
+
+exports.middleware = function (options) {
+  return require('ecstatic')(options.root);
+};
diff --git a/bench/index.js b/bench/index.js
diff --git a/bench/lib/repeat.js b/bench/lib/repeat.js
diff --git a/bench/lib/siege.js b/bench/lib/siege.js
diff --git a/bench/lib/summary.js b/bench/lib/summary.js
diff --git a/bench/lib/utils.js b/bench/lib/utils.js
@@ -0,0 +1,9 @@
+exports.resolve = require('path').resolve
+
+exports.version = function (name) {
+  if (name.match(/^buffet/)) {
+    return require(exports.resolve(__dirname, '../../package')).version;
+  }
+
+  return require(exports.resolve(__dirname, '../package')).dependencies[name];
+};
diff --git a/bench/lib/version.js b/bench/lib/version.js
diff --git a/bench/middleware/buffet-server.js b/bench/middleware/buffet-server.js
diff --git a/bench/middleware/buffet.js b/bench/middleware/buffet.js
diff --git a/bench/middleware/ecstatic.js b/bench/middleware/ecstatic.js
diff --git a/bench/middleware/node-static.js b/bench/middleware/node-static.js
diff --git a/bench/middleware/paperboy.js b/bench/middleware/paperboy.js
diff --git a/bench/middleware/send.js b/bench/middleware/send.js
diff --git a/bench/middleware/varnish.js b/bench/middleware/varnish.js
diff --git a/bench/node-static.js b/bench/node-static.js
@@ -0,0 +1,11 @@
+var utils = require('./lib/utils')
+
+exports.name = 'node-static';
+exports.version = utils.version(exports.name);
+
+exports.middleware = function (options) {
+  var nodeStatic = require('node-static')
+    , fileServer = new(nodeStatic.Server)(options.root)
+
+  return fileServer.serve.bind(fileServer);
+};