diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2013-07-19 23:59:41 +0200 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-07-20 12:13:54 +0200 |
commit | d75f67f949f2e3b7564671f02cb2ab8e86205e13 (patch) | |
tree | 187359834b38b391b225d7da8fa24597a7d63894 /benchmark/net/tcp-raw-s2c.js | |
parent | e1fe8d4ec08cc2576dd8ecd305f3f5654647a65e (diff) | |
download | android-node-v8-d75f67f949f2e3b7564671f02cb2ab8e86205e13.tar.gz android-node-v8-d75f67f949f2e3b7564671f02cb2ab8e86205e13.tar.bz2 android-node-v8-d75f67f949f2e3b7564671f02cb2ab8e86205e13.zip |
bench: fix up benchmarks after internal api change
Diffstat (limited to 'benchmark/net/tcp-raw-s2c.js')
-rw-r--r-- | benchmark/net/tcp-raw-s2c.js | 61 |
1 files changed, 29 insertions, 32 deletions
diff --git a/benchmark/net/tcp-raw-s2c.js b/benchmark/net/tcp-raw-s2c.js index 9d3e579450..6fb6568527 100644 --- a/benchmark/net/tcp-raw-s2c.js +++ b/benchmark/net/tcp-raw-s2c.js @@ -2,6 +2,7 @@ // as many bytes as we can in the specified time (default = 10s) var common = require('../common.js'); +var util = require('util'); // if there are dur=N and len=N args, then // run the function with those settings. @@ -26,27 +27,23 @@ function main(conf) { server(); } - -function fail(syscall) { - var e = new Error(syscall + ' ' + errno); - e.errno = e.code = errno; - e.syscall = syscall; - throw e; +function fail(err, syscall) { + throw util._errnoException(err, syscall); } function server() { var serverHandle = new TCP(); - var r = serverHandle.bind('127.0.0.1', PORT); - if (r) - fail('bind'); + var err = serverHandle.bind('127.0.0.1', PORT); + if (err) + fail(err, 'bind'); - var r = serverHandle.listen(511); - if (r) - fail('listen'); + err = serverHandle.listen(511); + if (err) + fail(err, 'listen'); - serverHandle.onconnection = function(clientHandle) { - if (!clientHandle) - fail('connect'); + serverHandle.onconnection = function(err, clientHandle) { + if (err) + fail(err, 'connect'); var chunk; switch (type) { @@ -71,28 +68,27 @@ function server() { write(); function write() { - var writeReq + var writeReq = { oncomplete: afterWrite }; + var err; switch (type) { case 'buf': - writeReq = clientHandle.writeBuffer(chunk); + err = clientHandle.writeBuffer(writeReq, chunk); break; case 'utf': - writeReq = clientHandle.writeUtf8String(chunk); + err = clientHandle.writeUtf8String(writeReq, chunk); break; case 'asc': - writeReq = clientHandle.writeAsciiString(chunk); + err = clientHandle.writeAsciiString(writeReq, chunk); break; } - if (!writeReq) - fail('write'); - - writeReq.oncomplete = afterWrite; + if (err) + fail(err, 'write'); } - function afterWrite(status, handle, req) { - if (status) - fail('write'); + function afterWrite(err, handle, req) { + if (err) + fail(err, 'write'); while (clientHandle.writeQueueSize === 0) write(); @@ -104,18 +100,19 @@ function server() { function client() { var clientHandle = new TCP(); - var connectReq = clientHandle.connect('127.0.0.1', PORT); + var connectReq = {}; + var err = clientHandle.connect(connectReq, '127.0.0.1', PORT); - if (!connectReq) - fail('connect'); + if (err) + fail(err, 'connect'); connectReq.oncomplete = function() { var bytes = 0; - clientHandle.onread = function(buffer) { + clientHandle.onread = function(nread, buffer) { // we're not expecting to ever get an EOF from the client. // just lots of data forever. - if (!buffer) - fail('read'); + if (nread < 0) + fail(nread, 'read'); // don't slice the buffer. the point of this is to isolate, not // simulate real traffic. |