noderb 0.0.4 → 0.0.6

data/ext/noderb_extension/libuv/test/test-getaddrinfo.c

@@ -69,14 +69,16 @@ TEST_IMPL(getaddrinfo_basic) {
 
   uv_init();
 
-  r = uv_getaddrinfo(&getaddrinfo_handle,
+
+  r = uv_getaddrinfo(uv_default_loop(),
+                     &getaddrinfo_handle,
                      &getaddrinfo_basic_cb,
                      name,
                      NULL,
                      NULL);
   ASSERT(r == 0);
 
-  uv_run();
+  uv_run(uv_default_loop());
 
   ASSERT(getaddrinfo_cbs == 1);
 
@@ -92,15 +94,16 @@ TEST_IMPL(getaddrinfo_concurrent) {
   for (i = 0; i < CONCURRENT_COUNT; i++) {
     callback_counts[i] = 0;
 
-    r = uv_getaddrinfo(&getaddrinfo_handles[i],
-                   &getaddrinfo_cuncurrent_cb,
-                   name,
-                   NULL,
-                   NULL);
+    r = uv_getaddrinfo(uv_default_loop(),
+                       &getaddrinfo_handles[i],
+                       &getaddrinfo_cuncurrent_cb,
+                       name,
+                       NULL,
+                       NULL);
     ASSERT(r == 0);
   }
 
-  uv_run();
+  uv_run(uv_default_loop());
 
   for (i = 0; i < CONCURRENT_COUNT; i++) {
     ASSERT(callback_counts[i] == 1);

data/ext/noderb_extension/libuv/test/test-gethostbyname.c

@@ -74,8 +74,7 @@ static void prep_tcploopback() {
   options.tcp_port = htons(TEST_PORT);
   options.flags = ARES_FLAG_USEVC;
 
-  rc = uv_ares_init_options(&channel, &options, optmask);
-
+  rc = uv_ares_init_options(uv_default_loop(), &channel, &options, optmask);
   ASSERT(rc == ARES_SUCCESS);
 }
 
@@ -104,11 +103,11 @@ TEST_IMPL(gethostbyname) {
                     AF_INET,
                     &aresbynamecallback,
                     &bynamecallbacksig);
-  uv_run();
+  uv_run(uv_default_loop());
 
   ASSERT(ares_bynamecallbacks == 1);
 
-  uv_ares_destroy(channel);
+  uv_ares_destroy(uv_default_loop(), channel);
   printf("Done basic gethostbyname test\n");
 
 
@@ -125,7 +124,7 @@ TEST_IMPL(gethostbyname) {
                     AF_INET,
                     &aresbynamecallback,
                     &bynamecallbacksig);
-  uv_run();
+  uv_run(uv_default_loop());
 
   ASSERT(ares_bynamecallbacks == 1);
 
@@ -143,11 +142,11 @@ TEST_IMPL(gethostbyname) {
                     &aresbyaddrcallback,
                     &byaddrcallbacksig);
 
-  uv_run();
+  uv_run(uv_default_loop());
 
   ASSERT(ares_byaddrcallbacks == 1);
 
-  uv_ares_destroy(channel);
+  uv_ares_destroy(uv_default_loop(), channel);
   printf("Done gethostbyname and gethostbyaddr sequential test\n");
 
 
@@ -179,13 +178,13 @@ TEST_IMPL(gethostbyname) {
                     &aresbyaddrcallback,
                     &byaddrcallbacksig);
 
-  uv_run();
+  uv_run(uv_default_loop());
 
   ASSERT(ares_bynamecallbacks == 1);
   ASSERT(ares_byaddrcallbacks == 1);
 
 
-  uv_ares_destroy(channel);
+  uv_ares_destroy(uv_default_loop(), channel);
   printf("Done gethostbyname and gethostbyaddr concurrent test\n");
 
   return 0;

data/ext/noderb_extension/libuv/test/test-getsockname.c

@@ -22,18 +22,23 @@
 #include "uv.h"
 #include "task.h"
 
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-static int getsocknamecount = 0;
 
+static int getsocknamecount = 0;
 
+static uv_loop_t* loop;
 static uv_tcp_t tcp;
+static uv_udp_t udp;
 static uv_connect_t connect_req;
 static uv_tcp_t tcpServer;
+static uv_udp_t udpServer;
+static uv_udp_send_t send_req;
 
 
-static uv_buf_t alloc(uv_stream_t* handle, size_t suggested_size) {
+static uv_buf_t alloc(uv_handle_t* handle, size_t suggested_size) {
   uv_buf_t buf;
   buf.base = (char*) malloc(suggested_size);
   buf.len = suggested_size;
@@ -74,14 +79,15 @@ static void on_connection(uv_stream_t* server, int status) {
   int r;
 
   if (status != 0) {
-    fprintf(stderr, "Connect error %d\n", uv_last_error().code);
+    fprintf(stderr, "Connect error %d\n",
+        uv_last_error(loop).code);
   }
   ASSERT(status == 0);
 
   handle = (uv_handle_t*) malloc(sizeof(uv_tcp_t));
   ASSERT(handle != NULL);
 
-  uv_tcp_init((uv_tcp_t*)handle);
+  uv_tcp_init(loop, (uv_tcp_t*)handle);
 
   /* associate server with stream */
   handle->data = server;
@@ -89,9 +95,10 @@ static void on_connection(uv_stream_t* server, int status) {
   r = uv_accept(server, (uv_stream_t*)handle);
   ASSERT(r == 0);
 
-  status = uv_getsockname((uv_tcp_t*)handle, &sockname, &namelen);
+  status = uv_getsockname(handle, &sockname, &namelen);
   if (status != 0) {
-    fprintf(stderr, "uv_getsockname error (accepted) %d\n", uv_last_error().code);
+    fprintf(stderr, "uv_getsockname error (accepted) %d\n",
+        uv_last_error(loop).code);
   }
   ASSERT(status == 0);
 
@@ -99,7 +106,6 @@ static void on_connection(uv_stream_t* server, int status) {
 
   r = uv_read_start((uv_stream_t*)handle, alloc, after_read);
   ASSERT(r == 0);
-
 }
 
 
@@ -110,9 +116,10 @@ static void on_connect(uv_connect_t* req, int status) {
 
   ASSERT(status == 0);
 
-  r = uv_getsockname(&tcp, &sockname, &namelen);
+  r = uv_getsockname((uv_handle_t*)&tcp, &sockname, &namelen);
   if (r != 0) {
-    fprintf(stderr, "uv_getsockname error (connector) %d\n", uv_last_error().code);
+    fprintf(stderr, "uv_getsockname error (connector) %d\n",
+        uv_last_error(loop).code);
   }
   ASSERT(r == 0);
 
@@ -129,7 +136,7 @@ static int tcp_listener(int port) {
   char ip[20];
   int r;
 
-  r = uv_tcp_init(&tcpServer);
+  r = uv_tcp_init(loop, &tcpServer);
   if (r) {
     fprintf(stderr, "Socket creation error\n");
     return 1;
@@ -147,9 +154,12 @@ static int tcp_listener(int port) {
     return 1;
   }
 
-  r = uv_getsockname(&tcpServer, &sockname, &namelen);
+  memset(&sockname, -1, sizeof sockname);
+
+  r = uv_getsockname((uv_handle_t*)&tcpServer, &sockname, &namelen);
   if (r != 0) {
-    fprintf(stderr, "uv_getsockname error (listening) %d\n", uv_last_error().code);
+    fprintf(stderr, "uv_getsockname error (listening) %d\n",
+        uv_last_error(loop).code);
   }
   ASSERT(r == 0);
 
@@ -170,7 +180,7 @@ static void tcp_connector() {
   int r;
   struct sockaddr_in server_addr = uv_ip4_addr("127.0.0.1", TEST_PORT);
 
-  r = uv_tcp_init(&tcp);
+  r = uv_tcp_init(loop, &tcp);
   tcp.data = &connect_req;
   ASSERT(!r);
 
@@ -179,18 +189,134 @@ static void tcp_connector() {
 }
 
 
-TEST_IMPL(getsockname) {
+static void udp_recv(uv_udp_t* handle,
+                     ssize_t nread,
+                     uv_buf_t buf,
+                     struct sockaddr* addr,
+                     unsigned flags) {
+  struct sockaddr sockname;
+  char ip[20];
+  int namelen;
+  int r;
+
+  ASSERT(nread >= 0);
+
+  if (nread == 0) {
+    free(buf.base);
+    return;
+  }
+
+  namelen = sizeof(sockname);
+  r = uv_getsockname((uv_handle_t*)&udp, &sockname, &namelen);
+  if (r != 0) {
+    fprintf(stderr, "uv_getsockname error (connector) %d\n", uv_last_error(loop).code);
+  }
+  ASSERT(r == 0);
+
+  r = uv_ip4_name((struct sockaddr_in*)&sockname, ip, 20);
+  ASSERT(r == 0);
+  printf("sockname = %s\n", ip);
+
+  getsocknamecount++;
+
+  uv_close((uv_handle_t*) &udp, NULL);
+  uv_close((uv_handle_t*) handle, NULL);
+}
+
+
+static void udp_send(uv_udp_send_t* req, int status) {
+
+}
+
+
+static int udp_listener(int port) {
+  struct sockaddr_in addr = uv_ip4_addr("0.0.0.0", port);
+  struct sockaddr sockname;
+  int namelen = sizeof(sockname);
+  char ip[20];
+  int r;
+
+  r = uv_udp_init(loop, &udpServer);
+  if (r) {
+    fprintf(stderr, "Socket creation error\n");
+    return 1;
+  }
+
+  r = uv_udp_bind(&udpServer, addr, 0);
+  if (r) {
+    fprintf(stderr, "Bind error\n");
+    return 1;
+  }
+
+  memset(&sockname, -1, sizeof sockname);
+
+  r = uv_getsockname((uv_handle_t*)&udpServer, &sockname, &namelen);
+  if (r != 0) {
+    fprintf(stderr, "uv_getsockname error (listening) %d\n", uv_last_error(loop).code);
+  }
+  ASSERT(r == 0);
+
+  r = uv_ip4_name((struct sockaddr_in*)&sockname, ip, 20);
+  ASSERT(r == 0);
+  ASSERT(ip[0] == '0');
+  ASSERT(ip[1] == '.');
+  ASSERT(ip[2] == '0');
+  printf("sockname = %s\n", ip);
+
+  getsocknamecount++;
+
+  r = uv_udp_recv_start(&udpServer, alloc, udp_recv);
+  ASSERT(r == 0);
+
+  return 0;
+}
+
+
+static void udp_sender(void) {
+  struct sockaddr_in server_addr;
+  uv_buf_t buf;
+  int r;
+
+  r = uv_udp_init(loop, &udp);
+  ASSERT(!r);
+
+  buf = uv_buf_init("PING", 4);
+  server_addr = uv_ip4_addr("127.0.0.1", TEST_PORT);
+
+  r = uv_udp_send(&send_req, &udp, &buf, 1, server_addr, udp_send);
+  ASSERT(!r);
+}
+
+
+TEST_IMPL(getsockname_tcp) {
   uv_init();
+  loop = uv_default_loop();
 
   if (tcp_listener(TEST_PORT))
     return 1;
 
   tcp_connector();
 
-  uv_run();
+  uv_run(loop);
 
   ASSERT(getsocknamecount == 3);
 
   return 0;
 }
 
+
+TEST_IMPL(getsockname_udp) {
+  uv_init();
+  loop = uv_default_loop();
+
+  if (udp_listener(TEST_PORT))
+    return 1;
+
+  udp_sender();
+
+  uv_run(loop);
+
+  ASSERT(getsocknamecount == 2);
+
+  return 0;
+}

data/ext/noderb_extension/libuv/test/test-idle.c

@@ -62,17 +62,18 @@ TEST_IMPL(idle_starvation) {
 
   uv_init();
 
-  r = uv_idle_init(&idle_handle);
+
+  r = uv_idle_init(uv_default_loop(), &idle_handle);
   ASSERT(r == 0);
   r = uv_idle_start(&idle_handle, idle_cb);
   ASSERT(r == 0);
 
-  r = uv_timer_init(&timer_handle);
+  r = uv_timer_init(uv_default_loop(), &timer_handle);
   ASSERT(r == 0);
   r = uv_timer_start(&timer_handle, timer_cb, 50, 0);
   ASSERT(r == 0);
 
-  r = uv_run();
+  r = uv_run(uv_default_loop());
   ASSERT(r == 0);
 
   ASSERT(idle_cb_called > 0);

data/ext/noderb_extension/libuv/test/test-list.h

@@ -36,6 +36,10 @@ TEST_DECLARE   (tcp_bind6_error_addrnotavail)
 TEST_DECLARE   (tcp_bind6_error_fault)
 TEST_DECLARE   (tcp_bind6_error_inval)
 TEST_DECLARE   (tcp_bind6_localhost_ok)
+TEST_DECLARE   (udp_send_and_recv)
+TEST_DECLARE   (udp_dgram_too_big)
+TEST_DECLARE   (udp_dual_stack)
+TEST_DECLARE   (udp_ipv6_only)
 TEST_DECLARE   (pipe_bind_error_addrinuse)
 TEST_DECLARE   (pipe_bind_error_addrnotavail)
 TEST_DECLARE   (pipe_bind_error_inval)
@@ -60,13 +64,21 @@ TEST_DECLARE   (hrtime)
 TEST_DECLARE   (getaddrinfo_basic)
 TEST_DECLARE   (getaddrinfo_concurrent)
 TEST_DECLARE   (gethostbyname)
-TEST_DECLARE   (getsockname)
+TEST_DECLARE   (getsockname_tcp)
+TEST_DECLARE   (getsockname_udp)
 TEST_DECLARE   (fail_always)
 TEST_DECLARE   (pass_always)
 TEST_DECLARE   (spawn_exit_code)
 TEST_DECLARE   (spawn_stdout)
 TEST_DECLARE   (spawn_stdin)
 TEST_DECLARE   (spawn_and_kill)
+TEST_DECLARE   (fs_file_async)
+TEST_DECLARE   (fs_file_sync)
+TEST_DECLARE   (fs_async_dir)
+TEST_DECLARE   (fs_async_sendfile)
+TEST_DECLARE   (fs_fstat)
+TEST_DECLARE   (fs_chmod)
+TEST_DECLARE   (threadpool_queue_work_simple)
 #ifdef _WIN32
 TEST_DECLARE   (spawn_detect_pipe_name_collisions_on_windows)
 TEST_DECLARE   (argument_escaping)
@@ -106,6 +118,11 @@ TASK_LIST_START
   TEST_ENTRY  (tcp_bind6_error_inval)
   TEST_ENTRY  (tcp_bind6_localhost_ok)
 
+  TEST_ENTRY  (udp_send_and_recv)
+  TEST_ENTRY  (udp_dgram_too_big)
+  TEST_ENTRY  (udp_dual_stack)
+  TEST_ENTRY  (udp_ipv6_only)
+
   TEST_ENTRY  (pipe_bind_error_addrinuse)
   TEST_ENTRY  (pipe_bind_error_addrnotavail)
   TEST_ENTRY  (pipe_bind_error_inval)
@@ -147,7 +164,8 @@ TASK_LIST_START
   TEST_ENTRY  (gethostbyname)
   TEST_HELPER (gethostbyname, tcp4_echo_server)
 
-  TEST_ENTRY  (getsockname)
+  TEST_ENTRY  (getsockname_tcp)
+  TEST_ENTRY  (getsockname_udp)
 
   TEST_ENTRY  (spawn_exit_code)
   TEST_ENTRY  (spawn_stdout)
@@ -159,6 +177,15 @@ TASK_LIST_START
   TEST_ENTRY  (environment_creation)
 #endif
 
+  TEST_ENTRY  (fs_file_async)
+  TEST_ENTRY  (fs_file_sync)
+  TEST_ENTRY  (fs_async_dir)
+  TEST_ENTRY  (fs_async_sendfile)
+  TEST_ENTRY  (fs_fstat)
+  TEST_ENTRY  (fs_chmod)
+
+  TEST_ENTRY  (threadpool_queue_work_simple)
+
 #if 0
   /* These are for testing the test runner. */
   TEST_ENTRY  (fail_always)

data/ext/noderb_extension/libuv/test/test-loop-handles.c

@@ -153,7 +153,7 @@ static void idle_1_cb(uv_idle_t* handle, int status) {
 
   /* Init idle_2 and make it active */
   if (!idle_2_is_active) {
-    r = uv_idle_init(&idle_2_handle);
+    r = uv_idle_init(uv_default_loop(), &idle_2_handle);
     ASSERT(r == 0);
     r = uv_idle_start(&idle_2_handle, idle_2_cb);
     ASSERT(r == 0);
@@ -301,23 +301,24 @@ TEST_IMPL(loop_handles) {
 
   uv_init();
 
-  r = uv_prepare_init(&prepare_1_handle);
+
+  r = uv_prepare_init(uv_default_loop(), &prepare_1_handle);
   ASSERT(r == 0);
   r = uv_prepare_start(&prepare_1_handle, prepare_1_cb);
   ASSERT(r == 0);
 
-  r = uv_check_init(&check_handle);
+  r = uv_check_init(uv_default_loop(), &check_handle);
   ASSERT(r == 0);
   r = uv_check_start(&check_handle, check_cb);
   ASSERT(r == 0);
 
   /* initialize only, prepare_2 is started by prepare_1_cb */
-  r = uv_prepare_init(&prepare_2_handle);
+  r = uv_prepare_init(uv_default_loop(), &prepare_2_handle);
   ASSERT(r == 0);
 
   for (i = 0; i < IDLE_COUNT; i++) {
     /* initialize only, idle_1 handles are started by check_cb */
-    r = uv_idle_init(&idle_1_handles[i]);
+    r = uv_idle_init(uv_default_loop(), &idle_1_handles[i]);
     ASSERT(r == 0);
   }
 
@@ -325,13 +326,13 @@ TEST_IMPL(loop_handles) {
 
   /* the timer callback is there to keep the event loop polling */
   /* unref it as it is not supposed to keep the loop alive */
-  r = uv_timer_init(&timer_handle);
+  r = uv_timer_init(uv_default_loop(), &timer_handle);
   ASSERT(r == 0);
   r = uv_timer_start(&timer_handle, timer_cb, TIMEOUT, TIMEOUT);
   ASSERT(r == 0);
-  uv_unref();
+  uv_unref(uv_default_loop());
 
-  r = uv_run();
+  r = uv_run(uv_default_loop());
   ASSERT(r == 0);
 
   ASSERT(loop_iteration == ITERATIONS);

data/ext/noderb_extension/libuv/test/test-ping-pong.c

@@ -51,7 +51,7 @@ typedef struct {
 void pinger_try_read(pinger_t* pinger);
 
 
-static uv_buf_t alloc_cb(uv_stream_t* tcp, size_t size) {
+static uv_buf_t alloc_cb(uv_handle_t* handle, size_t size) {
   uv_buf_t buf;
   buf.base = (char*)malloc(size);
   buf.len = size;
@@ -94,13 +94,13 @@ static void pinger_write_ping(pinger_t* pinger) {
 
 
 static void pinger_read_cb(uv_stream_t* stream, ssize_t nread, uv_buf_t buf) {
-  unsigned int i;
+  ssize_t i;
   pinger_t* pinger;
 
   pinger = (pinger_t*)stream->data;
 
   if (nread < 0) {
-    ASSERT(uv_last_error().code == UV_EOF);
+    ASSERT(uv_last_error(uv_default_loop()).code == UV_EOF);
 
     puts("got EOF");
 
@@ -155,7 +155,7 @@ static void tcp_pinger_v6_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(uv_default_loop(), &pinger->tcp);
   pinger->tcp.data = pinger;
   ASSERT(!r);
 
@@ -180,7 +180,7 @@ static void tcp_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(uv_default_loop(), &pinger->tcp);
   pinger->tcp.data = pinger;
   ASSERT(!r);
 
@@ -204,7 +204,7 @@ static void pipe_pinger_new() {
   pinger->pongs = 0;
 
   /* Try to connec to the server and do NUM_PINGS ping-pongs. */
-  r = uv_pipe_init(&pinger->pipe);
+  r = uv_pipe_init(uv_default_loop(), &pinger->pipe);
   pinger->pipe.data = pinger;
   ASSERT(!r);
 
@@ -224,7 +224,7 @@ TEST_IMPL(tcp_ping_pong) {
   uv_init();
 
   tcp_pinger_new();
-  uv_run();
+  uv_run(uv_default_loop());
 
   ASSERT(completed_pingers == 1);
 
@@ -236,7 +236,7 @@ TEST_IMPL(tcp_ping_pong_v6) {
   uv_init();
 
   tcp_pinger_v6_new();
-  uv_run();
+  uv_run(uv_default_loop());
 
   ASSERT(completed_pingers == 1);
 
@@ -248,7 +248,7 @@ TEST_IMPL(pipe_ping_pong) {
   uv_init();
 
   pipe_pinger_new();
-  uv_run();
+  uv_run(uv_default_loop());
 
   ASSERT(completed_pingers == 1);
 

data/ext/noderb_extension/libuv/test/test-pipe-bind-error.c

@@ -47,29 +47,30 @@ TEST_IMPL(pipe_bind_error_addrinuse) {
 
   uv_init();
 
-  r = uv_pipe_init(&server1);
+
+  r = uv_pipe_init(uv_default_loop(), &server1);
   ASSERT(r == 0);
   r = uv_pipe_bind(&server1, TEST_PIPENAME);
   ASSERT(r == 0);
 
-  r = uv_pipe_init(&server2);
+  r = uv_pipe_init(uv_default_loop(), &server2);
   ASSERT(r == 0);
   r = uv_pipe_bind(&server2, TEST_PIPENAME);
   ASSERT(r == -1);
 
-  ASSERT(uv_last_error().code == UV_EADDRINUSE);
+  ASSERT(uv_last_error(uv_default_loop()).code == UV_EADDRINUSE);
 
   r = uv_listen((uv_stream_t*)&server1, SOMAXCONN, NULL);
   ASSERT(r == 0);
   r = uv_listen((uv_stream_t*)&server2, SOMAXCONN, NULL);
   ASSERT(r == -1);
 
-  ASSERT(uv_last_error().code == UV_EINVAL);
+  ASSERT(uv_last_error(uv_default_loop()).code == UV_EINVAL);
 
   uv_close((uv_handle_t*)&server1, close_cb);
   uv_close((uv_handle_t*)&server2, close_cb);
 
-  uv_run();
+  uv_run(uv_default_loop());
 
   ASSERT(close_cb_called == 2);
 
@@ -83,16 +84,17 @@ TEST_IMPL(pipe_bind_error_addrnotavail) {
 
   uv_init();
 
-  r = uv_pipe_init(&server);
+
+  r = uv_pipe_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_pipe_bind(&server, BAD_PIPENAME);
 
   ASSERT(r == -1);
-  ASSERT(uv_last_error().code == UV_EACCESS);
+  ASSERT(uv_last_error(uv_default_loop()).code == UV_EACCESS);
 
   uv_close((uv_handle_t*)&server, close_cb);
 
-  uv_run();
+  uv_run(uv_default_loop());
 
   ASSERT(close_cb_called == 1);
 
@@ -106,18 +108,19 @@ TEST_IMPL(pipe_bind_error_inval) {
 
   uv_init();
 
-  r = uv_pipe_init(&server);
+
+  r = uv_pipe_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_pipe_bind(&server, TEST_PIPENAME);
   ASSERT(r == 0);
   r = uv_pipe_bind(&server, TEST_PIPENAME_2);
   ASSERT(r == -1);
 
-  ASSERT(uv_last_error().code == UV_EINVAL);
+  ASSERT(uv_last_error(uv_default_loop()).code == UV_EINVAL);
 
   uv_close((uv_handle_t*)&server, close_cb);
 
-  uv_run();
+  uv_run(uv_default_loop());
 
   ASSERT(close_cb_called == 1);
 
@@ -131,16 +134,17 @@ TEST_IMPL(pipe_listen_without_bind) {
 
   uv_init();
 
-  r = uv_pipe_init(&server);
+
+  r = uv_pipe_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_listen((uv_stream_t*)&server, SOMAXCONN, NULL);
   ASSERT(r == -1);
 
-  ASSERT(uv_last_error().code == UV_EINVAL);
+  ASSERT(uv_last_error(uv_default_loop()).code == UV_EINVAL);
 
   uv_close((uv_handle_t*)&server, close_cb);
 
-  uv_run();
+  uv_run(uv_default_loop());
 
   ASSERT(close_cb_called == 1);