summaryrefslogtreecommitdiff
path: root/deps/uv/test/benchmark-ping-pongs.c
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2011-08-31 01:53:01 -0700
committerRyan Dahl <ry@tinyclouds.org>2011-08-31 01:53:30 -0700
commit21cc4c4985fdf40cc128cd88cfdc02fd49e33b26 (patch)
treefbda524d1b1a9f12b6b271574ac3383d27eacb7e /deps/uv/test/benchmark-ping-pongs.c
parent6f606838025c4e87701f360135f1ae72e968dc4c (diff)
downloadandroid-node-v8-21cc4c4985fdf40cc128cd88cfdc02fd49e33b26.tar.gz
android-node-v8-21cc4c4985fdf40cc128cd88cfdc02fd49e33b26.tar.bz2
android-node-v8-21cc4c4985fdf40cc128cd88cfdc02fd49e33b26.zip
Upgrade libuv to ea4271f
Required adding uv_default_loop() in many places.
Diffstat (limited to 'deps/uv/test/benchmark-ping-pongs.c')
-rw-r--r--deps/uv/test/benchmark-ping-pongs.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/deps/uv/test/benchmark-ping-pongs.c b/deps/uv/test/benchmark-ping-pongs.c
index 8056723998..c3263ae5f2 100644
--- a/deps/uv/test/benchmark-ping-pongs.c
+++ b/deps/uv/test/benchmark-ping-pongs.c
@@ -46,6 +46,8 @@ typedef struct buf_s {
static char PING[] = "PING\n";
+static uv_loop_t* loop;
+
static buf_t* buf_freelist = NULL;
static int pinger_shutdown_cb_called;
static int completed_pingers = 0;
@@ -130,7 +132,7 @@ static void pinger_read_cb(uv_stream_t* tcp, ssize_t nread, uv_buf_t buf) {
pinger = (pinger_t*)tcp->data;
if (nread < 0) {
- ASSERT(uv_last_error().code == UV_EOF);
+ ASSERT(uv_last_error(loop).code == UV_EOF);
if (buf.base) {
buf_free(buf);
@@ -148,7 +150,7 @@ static void pinger_read_cb(uv_stream_t* tcp, ssize_t nread, uv_buf_t buf) {
pinger->state = (pinger->state + 1) % (sizeof(PING) - 1);
if (pinger->state == 0) {
pinger->pongs++;
- if (uv_now() - start_time > TIME) {
+ if (uv_now(loop) - start_time > TIME) {
uv_shutdown(&pinger->shutdown_req, (uv_stream_t*) tcp, pinger_shutdown_cb);
break;
} else {
@@ -185,7 +187,7 @@ static void pinger_new() {
pinger->pongs = 0;
/* Try to connec to the server and do NUM_PINGS ping-pongs. */
- r = uv_tcp_init(&pinger->tcp);
+ r = uv_tcp_init(loop, &pinger->tcp);
ASSERT(!r);
pinger->tcp.data = pinger;
@@ -199,10 +201,12 @@ static void pinger_new() {
BENCHMARK_IMPL(ping_pongs) {
uv_init();
- start_time = uv_now();
+ loop = uv_default_loop();
+
+ start_time = uv_now(loop);
pinger_new();
- uv_run();
+ uv_run(loop);
ASSERT(completed_pingers == 1);