Upgrade benchmark scripts for new module API

diff --git a/benchmark/http_simple.js b/benchmark/http_simple.js
index ab4955b..7fec434 100644 (file)
--- a/benchmark/http_simple.js
+++ b/benchmark/http_simple.js
@@ -1,8 +1,8 @@
 libDir = process.path.join(process.path.dirname(__filename), "../lib");
 require.paths.unshift(libDir);
 
-process.mixin(require("/utils.js"));
-http = require("/http.js");
+process.mixin(require("sys"));
+http = require("sys");
 
 fixed = ""
 for (var i = 0; i < 20*1024; i++) {

diff --git a/benchmark/process_loop.js b/benchmark/process_loop.js
index 962ad93..372a89c 100644 (file)
--- a/benchmark/process_loop.js
+++ b/benchmark/process_loop.js
@@ -1,6 +1,7 @@
-libDir = process.path.join(process.path.dirname(__filename), "../lib");
+var path = require("path");
+libDir = path.join(path.dirname(__filename), "../lib");
 require.paths.unshift(libDir);
-process.mixin(require("/utils.js"));
+process.mixin(require("sys"));
 function next (i) {
   if (i <= 0) return;
 

diff --git a/benchmark/run.js b/benchmark/run.js
index 820c4e3..8466b97 100644 (file)
--- a/benchmark/run.js
+++ b/benchmark/run.js
@@ -1,16 +1,17 @@
-libDir = process.path.join(process.path.dirname(__filename), "../lib");
+var path = require("path");
+libDir = path.join(path.dirname(__filename), "../lib");
 require.paths.unshift(libDir);
-process.mixin(require("/utils.js"));
+process.mixin(require("sys"));
 var benchmarks = [ "static_http_server.js" 
                  , "timers.js"
                  , "process_loop.js"
                  ];
 
-var benchmark_dir = process.path.dirname(__filename);
+var benchmark_dir = path.dirname(__filename);
 
 function exec (script, callback) {
   var start = new Date();
-  var child = process.createChildProcess(process.ARGV[0], [process.path.join(benchmark_dir, script)]);
+  var child = process.createChildProcess(process.ARGV[0], [path.join(benchmark_dir, script)]);
   child.addListener("exit", function (code) {
     var elapsed = new Date() - start;
     callback(elapsed, code);

diff --git a/benchmark/static_http_server.js b/benchmark/static_http_server.js
index 47e9268..6d925b5 100644 (file)
--- a/benchmark/static_http_server.js
+++ b/benchmark/static_http_server.js
@@ -1,6 +1,7 @@
-libDir = process.path.join(process.path.dirname(__filename), "../lib");
+var path = require("path");
+libDir = path.join(path.dirname(__filename), "../lib");
 require.paths.unshift(libDir);
-http = require("/http.js");
+http = require("http");
 var concurrency = 30;
 var port = 8000;
 var n = 700;