noderb 0.0.8 → 0.0.9

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

@@ -43,7 +43,7 @@ typedef struct {
   union {
     uv_tcp_t tcp;
     uv_pipe_t pipe;
-  };
+  } stream;
   uv_connect_t connect_req;
   char read_buffer[BUFSIZE];
 } pinger_t;
@@ -85,7 +85,7 @@ static void pinger_write_ping(pinger_t* pinger) {
 
   req = malloc(sizeof(uv_write_t));
 
-  if (uv_write(req, (uv_stream_t*)&pinger->tcp, &buf, 1, pinger_after_write)) {
+  if (uv_write(req, (uv_stream_t*)&pinger->stream.tcp, &buf, 1, pinger_after_write)) {
     FATAL("uv_write failed");
   }
 
@@ -108,7 +108,7 @@ static void pinger_read_cb(uv_stream_t* stream, ssize_t nread, uv_buf_t buf) {
       free(buf.base);
     }
 
-    uv_close((uv_handle_t*)(&pinger->tcp), pinger_on_close);
+    uv_close((uv_handle_t*)(&pinger->stream.tcp), pinger_on_close);
 
     return;
   }
@@ -123,7 +123,7 @@ static void pinger_read_cb(uv_stream_t* stream, ssize_t nread, uv_buf_t buf) {
       if (pinger->pongs < NUM_PINGS) {
         pinger_write_ping(pinger);
       } else {
-        uv_close((uv_handle_t*)(&pinger->tcp), pinger_on_close);
+        uv_close((uv_handle_t*)(&pinger->stream.tcp), pinger_on_close);
         return;
       }
     }
@@ -155,13 +155,13 @@ 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(uv_default_loop(), &pinger->tcp);
-  pinger->tcp.data = pinger;
+  r = uv_tcp_init(uv_default_loop(), &pinger->stream.tcp);
+  pinger->stream.tcp.data = pinger;
   ASSERT(!r);
 
   /* We are never doing multiple reads/connects at a time anyway. */
   /* so these handles can be pre-initialized. */
-  r = uv_tcp_connect6(&pinger->connect_req, &pinger->tcp, server_addr,
+  r = uv_tcp_connect6(&pinger->connect_req, &pinger->stream.tcp, server_addr,
       pinger_on_connect);
   ASSERT(!r);
 
@@ -180,13 +180,13 @@ static void tcp_pinger_new() {
   pinger->pongs = 0;
 
   /* Try to connec to the server and do NUM_PINGS ping-pongs. */
-  r = uv_tcp_init(uv_default_loop(), &pinger->tcp);
-  pinger->tcp.data = pinger;
+  r = uv_tcp_init(uv_default_loop(), &pinger->stream.tcp);
+  pinger->stream.tcp.data = pinger;
   ASSERT(!r);
 
   /* We are never doing multiple reads/connects at a time anyway. */
   /* so these handles can be pre-initialized. */
-  r = uv_tcp_connect(&pinger->connect_req, &pinger->tcp, server_addr,
+  r = uv_tcp_connect(&pinger->connect_req, &pinger->stream.tcp, server_addr,
       pinger_on_connect);
   ASSERT(!r);
 
@@ -204,14 +204,14 @@ static void pipe_pinger_new() {
   pinger->pongs = 0;
 
   /* Try to connec to the server and do NUM_PINGS ping-pongs. */
-  r = uv_pipe_init(uv_default_loop(), &pinger->pipe);
-  pinger->pipe.data = pinger;
+  r = uv_pipe_init(uv_default_loop(), &pinger->stream.pipe);
+  pinger->stream.pipe.data = pinger;
   ASSERT(!r);
 
   /* We are never doing multiple reads/connects at a time anyway. */
   /* so these handles can be pre-initialized. */
 
-  r = uv_pipe_connect(&pinger->connect_req, &pinger->pipe, TEST_PIPENAME,
+  r = uv_pipe_connect(&pinger->connect_req, &pinger->stream.pipe, TEST_PIPENAME,
       pinger_on_connect);
   ASSERT(!r);
 
@@ -221,8 +221,6 @@ static void pipe_pinger_new() {
 
 
 TEST_IMPL(tcp_ping_pong) {
-  uv_init();
-
   tcp_pinger_new();
   uv_run(uv_default_loop());
 
@@ -233,8 +231,6 @@ TEST_IMPL(tcp_ping_pong) {
 
 
 TEST_IMPL(tcp_ping_pong_v6) {
-  uv_init();
-
   tcp_pinger_v6_new();
   uv_run(uv_default_loop());
 
@@ -245,8 +241,6 @@ TEST_IMPL(tcp_ping_pong_v6) {
 
 
 TEST_IMPL(pipe_ping_pong) {
-  uv_init();
-
   pipe_pinger_new();
   uv_run(uv_default_loop());
 

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

@@ -45,9 +45,6 @@ TEST_IMPL(pipe_bind_error_addrinuse) {
   uv_pipe_t server1, server2;
   int r;
 
-  uv_init();
-
-
   r = uv_pipe_init(uv_default_loop(), &server1);
   ASSERT(r == 0);
   r = uv_pipe_bind(&server1, TEST_PIPENAME);
@@ -82,9 +79,6 @@ TEST_IMPL(pipe_bind_error_addrnotavail) {
   uv_pipe_t server;
   int r;
 
-  uv_init();
-
-
   r = uv_pipe_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_pipe_bind(&server, BAD_PIPENAME);
@@ -106,9 +100,6 @@ TEST_IMPL(pipe_bind_error_inval) {
   uv_pipe_t server;
   int r;
 
-  uv_init();
-
-
   r = uv_pipe_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_pipe_bind(&server, TEST_PIPENAME);
@@ -132,9 +123,6 @@ TEST_IMPL(pipe_listen_without_bind) {
   uv_pipe_t server;
   int r;
 
-  uv_init();
-
-
   r = uv_pipe_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_listen((uv_stream_t*)&server, SOMAXCONN, NULL);

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

@@ -24,7 +24,6 @@
 
 
 TEST_IMPL(ref) {
-  uv_init();
   uv_run(uv_default_loop());
   return 0;
 }
@@ -32,7 +31,6 @@ TEST_IMPL(ref) {
 
 TEST_IMPL(idle_ref) {
   uv_idle_t h;
-  uv_init();
   uv_idle_init(uv_default_loop(), &h);
   uv_idle_start(&h, NULL);
   uv_unref(uv_default_loop());
@@ -43,7 +41,6 @@ TEST_IMPL(idle_ref) {
 
 TEST_IMPL(async_ref) {
   uv_async_t h;
-  uv_init();
   uv_async_init(uv_default_loop(), &h, NULL);
   uv_unref(uv_default_loop());
   uv_run(uv_default_loop());
@@ -53,7 +50,6 @@ TEST_IMPL(async_ref) {
 
 TEST_IMPL(prepare_ref) {
   uv_prepare_t h;
-  uv_init();
   uv_prepare_init(uv_default_loop(), &h);
   uv_prepare_start(&h, NULL);
   uv_unref(uv_default_loop());
@@ -64,7 +60,6 @@ TEST_IMPL(prepare_ref) {
 
 TEST_IMPL(check_ref) {
   uv_check_t h;
-  uv_init();
   uv_check_init(uv_default_loop(), &h);
   uv_check_start(&h, NULL);
   uv_unref(uv_default_loop());
@@ -83,8 +78,6 @@ static void prepare_cb(uv_prepare_t* handle, int status) {
 
 TEST_IMPL(unref_in_prepare_cb) {
   uv_prepare_t h;
-  uv_init();
-
   uv_prepare_init(uv_default_loop(), &h);
   uv_prepare_start(&h, prepare_cb);
   uv_run(uv_default_loop());

data/ext/noderb_extension/libuv/test/test-shutdown-eof.c

@@ -153,12 +153,12 @@ TEST_IMPL(shutdown_eof) {
   struct sockaddr_in server_addr;
   int r;
 
-  uv_init();
-
   qbuf.base = "Q";
   qbuf.len = 1;
 
-  uv_timer_init(uv_default_loop(), &timer);
+  r = uv_timer_init(uv_default_loop(), &timer);
+  ASSERT(r == 0);
+
   uv_timer_start(&timer, timer_cb, 100, 0);
 
   server_addr = uv_ip4_addr("127.0.0.1", TEST_PORT);

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

@@ -23,12 +23,13 @@
 #include "task.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 static int close_cb_called;
 static int exit_cb_called;
 static uv_process_t process;
 static uv_timer_t timer;
-static uv_process_options_t options = { 0 };
+static uv_process_options_t options;
 static char exepath[1024];
 static size_t exepath_size = 1024;
 static char* args[3];
@@ -116,8 +117,6 @@ static void timer_cb(uv_timer_t* handle, int status) {
 TEST_IMPL(spawn_exit_code) {
   int r;
 
-  uv_init();
-
   init_process_options("spawn_helper1", exit_cb);
 
   r = uv_spawn(uv_default_loop(), &process, options);
@@ -137,8 +136,6 @@ TEST_IMPL(spawn_stdout) {
   int r;
   uv_pipe_t out;
 
-  uv_init();
-
   init_process_options("spawn_helper2", exit_cb);
 
   uv_pipe_init(uv_default_loop(), &out);
@@ -170,8 +167,6 @@ int r;
   uv_buf_t buf;
   char buffer[] = "hello-from-spawn_stdin";
 
-  uv_init();
-
   init_process_options("spawn_helper3", exit_cb);
 
   uv_pipe_init(uv_default_loop(), &out);
@@ -204,8 +199,6 @@ int r;
 TEST_IMPL(spawn_and_kill) {
   int r;
 
-  uv_init();
-
   init_process_options("spawn_helper4", kill_cb);
 
   r = uv_spawn(uv_default_loop(), &process, options);
@@ -234,8 +227,6 @@ TEST_IMPL(spawn_detect_pipe_name_collisions_on_windows) {
   char name[64];
   HANDLE pipe_handle;
 
-  uv_init();
-
   init_process_options("spawn_helper2", exit_cb);
 
   uv_pipe_init(uv_default_loop(), &out);

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

@@ -39,9 +39,6 @@ TEST_IMPL(tcp_bind_error_addrinuse) {
   uv_tcp_t server1, server2;
   int r;
 
-  uv_init();
-
-
   r = uv_tcp_init(uv_default_loop(), &server1);
   ASSERT(r == 0);
   r = uv_tcp_bind(&server1, addr);
@@ -75,9 +72,6 @@ TEST_IMPL(tcp_bind_error_addrnotavail_1) {
   uv_tcp_t server;
   int r;
 
-  uv_init();
-
-
   r = uv_tcp_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_tcp_bind(&server, addr);
@@ -102,8 +96,6 @@ TEST_IMPL(tcp_bind_error_addrnotavail_2) {
   uv_tcp_t server;
   int r;
 
-  uv_init();
-
   r = uv_tcp_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_tcp_bind(&server, addr);
@@ -128,9 +120,6 @@ TEST_IMPL(tcp_bind_error_fault) {
 
   garbage_addr = (struct sockaddr_in*) &garbage;
 
-  uv_init();
-
-
   r = uv_tcp_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_tcp_bind(&server, *garbage_addr);
@@ -155,9 +144,6 @@ TEST_IMPL(tcp_bind_error_inval) {
   uv_tcp_t server;
   int r;
 
-  uv_init();
-
-
   r = uv_tcp_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_tcp_bind(&server, addr1);
@@ -183,9 +169,6 @@ TEST_IMPL(tcp_bind_localhost_ok) {
   uv_tcp_t server;
   int r;
 
-  uv_init();
-
-
   r = uv_tcp_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_tcp_bind(&server, addr);
@@ -199,8 +182,6 @@ TEST_IMPL(tcp_listen_without_bind) {
   int r;
   uv_tcp_t server;
 
-  uv_init();
-
   r = uv_tcp_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_listen((uv_stream_t*)&server, 128, NULL);

data/ext/noderb_extension/libuv/test/test-tcp-bind6-error.c

@@ -39,9 +39,6 @@ TEST_IMPL(tcp_bind6_error_addrinuse) {
   uv_tcp_t server1, server2;
   int r;
 
-  uv_init();
-
-
   r = uv_tcp_init(uv_default_loop(), &server1);
   ASSERT(r == 0);
   r = uv_tcp_bind6(&server1, addr);
@@ -75,9 +72,6 @@ TEST_IMPL(tcp_bind6_error_addrnotavail) {
   uv_tcp_t server;
   int r;
 
-  uv_init();
-
-
   r = uv_tcp_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_tcp_bind6(&server, addr);
@@ -102,9 +96,6 @@ TEST_IMPL(tcp_bind6_error_fault) {
 
   garbage_addr = (struct sockaddr_in6*) &garbage;
 
-  uv_init();
-
-
   r = uv_tcp_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_tcp_bind6(&server, *garbage_addr);
@@ -129,9 +120,6 @@ TEST_IMPL(tcp_bind6_error_inval) {
   uv_tcp_t server;
   int r;
 
-  uv_init();
-
-
   r = uv_tcp_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_tcp_bind6(&server, addr1);
@@ -157,9 +145,6 @@ TEST_IMPL(tcp_bind6_localhost_ok) {
   uv_tcp_t server;
   int r;
 
-  uv_init();
-
-
   r = uv_tcp_init(uv_default_loop(), &server);
   ASSERT(r == 0);
   r = uv_tcp_bind6(&server, addr);

data/ext/noderb_extension/libuv/test/test-tcp-close.c

@@ -0,0 +1,129 @@
+/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "uv.h"
+#include "task.h"
+
+#include <errno.h>
+#include <string.h> /* memset */
+
+#define NUM_WRITE_REQS 32
+
+static uv_tcp_t tcp_handle;
+static uv_connect_t connect_req;
+
+static int write_cb_called;
+static int close_cb_called;
+
+static void connect_cb(uv_connect_t* req, int status);
+static void write_cb(uv_write_t* req, int status);
+static void close_cb(uv_handle_t* handle);
+
+
+static void connect_cb(uv_connect_t* conn_req, int status) {
+  uv_write_t* req;
+  uv_buf_t buf;
+  int i, r;
+
+  buf = uv_buf_init("PING", 4);
+  for (i = 0; i < NUM_WRITE_REQS; i++) {
+    req = malloc(sizeof *req);
+    ASSERT(req != NULL);
+
+    r = uv_write(req, (uv_stream_t*)&tcp_handle, &buf, 1, write_cb);
+    ASSERT(r == 0);
+  }
+
+  uv_close((uv_handle_t*)&tcp_handle, close_cb);
+}
+
+
+static void write_cb(uv_write_t* req, int status) {
+  /* write callbacks should run before the close callback */
+  ASSERT(close_cb_called == 0);
+  ASSERT(req->handle == (uv_stream_t*)&tcp_handle);
+  write_cb_called++;
+  free(req);
+}
+
+
+static void close_cb(uv_handle_t* handle) {
+  ASSERT(handle == (uv_handle_t*)&tcp_handle);
+  close_cb_called++;
+}
+
+
+static void connection_cb(uv_stream_t* server, int status) {
+  ASSERT(status == 0);
+}
+
+
+static void start_server(uv_loop_t* loop, uv_tcp_t* handle) {
+  int r;
+
+  r = uv_tcp_init(loop, handle);
+  ASSERT(r == 0);
+
+  r = uv_tcp_bind(handle, uv_ip4_addr("127.0.0.1", TEST_PORT));
+  ASSERT(r == 0);
+
+  r = uv_listen((uv_stream_t*)handle, 128, connection_cb);
+  ASSERT(r == 0);
+
+  uv_unref(loop);
+}
+
+
+/* Check that pending write requests have their callbacks
+ * invoked when the handle is closed.
+ */
+TEST_IMPL(tcp_close) {
+  uv_loop_t* loop;
+  uv_tcp_t tcp_server;
+  int r;
+
+  loop = uv_default_loop();
+
+  /* We can't use the echo server, it doesn't handle ECONNRESET. */
+  start_server(loop, &tcp_server);
+
+  r = uv_tcp_init(loop, &tcp_handle);
+  ASSERT(r == 0);
+
+  r = uv_tcp_connect(&connect_req,
+                     &tcp_handle,
+                     uv_ip4_addr("127.0.0.1", TEST_PORT),
+                     connect_cb);
+  ASSERT(r == 0);
+
+  ASSERT(write_cb_called == 0);
+  ASSERT(close_cb_called == 0);
+
+  r = uv_run(loop);
+  ASSERT(r == 0);
+
+  printf("%d of %d write reqs seen\n", write_cb_called, NUM_WRITE_REQS);
+
+  ASSERT(write_cb_called == NUM_WRITE_REQS);
+  ASSERT(close_cb_called == 1);
+
+  return 0;
+}