Upgrade libuv to d358738

3 files changed, 25 insertions, 6 deletions

diff --git a/deps/uv/config-unix.mk b/deps/uv/config-unix.mk
index 5776109150..53d566af58 100644
--- a/deps/uv/config-unix.mk
+++ b/deps/uv/config-unix.mk
@@ -75,7 +75,7 @@ endif
 # Need _GNU_SOURCE for strdup?
 RUNNER_CFLAGS=$(CFLAGS) -D_GNU_SOURCE
 
-RUNNER_LINKFLAGS=$(LINKFLAGS) -pthread
+RUNNER_LINKFLAGS=$(LINKFLAGS) -pthreads
 RUNNER_LIBS=
 RUNNER_SRC=test/runner-unix.c
 
diff --git a/deps/uv/src/uv-unix.c b/deps/uv/src/uv-unix.c
index dad3eeb61c..5e2d98c75e 100644
--- a/deps/uv/src/uv-unix.c
+++ b/deps/uv/src/uv-unix.c
@@ -647,9 +647,9 @@ static void uv__drain(uv_stream_t* stream) {
   ev_io_stop(EV_DEFAULT_ &stream->write_watcher);
 
   /* Shutdown? */
-  if ((((uv_handle_t*)stream)->flags & UV_SHUTTING) &&
-      !(((uv_handle_t*)stream)->flags & UV_CLOSING) &&
-      !(((uv_handle_t*)stream)->flags & UV_SHUT)) {
+  if ((stream->flags & UV_SHUTTING) &&
+      !(stream->flags & UV_CLOSING) &&
+      !(stream->flags & UV_SHUT)) {
     assert(stream->shutdown_req);
 
     req = stream->shutdown_req;
@@ -2193,6 +2193,9 @@ static void uv__chld(EV_P_ ev_child* watcher, int revents) {
   }
 }
 
+#ifndef SPAWN_WAIT_EXEC
+# define SPAWN_WAIT_EXEC 1
+#endif
 
 int uv_spawn(uv_process_t* process, uv_process_options_t options) {
   /*
@@ -2203,8 +2206,10 @@ int uv_spawn(uv_process_t* process, uv_process_options_t options) {
   int stdin_pipe[2] = { -1, -1 };
   int stdout_pipe[2] = { -1, -1 };
   int stderr_pipe[2] = { -1, -1 };
+#if SPAWN_WAIT_EXEC
   int signal_pipe[2] = { -1, -1 };
   struct pollfd pfd;
+#endif
   int status;
   pid_t pid;
 
@@ -2222,6 +2227,8 @@ int uv_spawn(uv_process_t* process, uv_process_options_t options) {
     if (pipe(stdin_pipe) < 0) {
       goto error;
     }
+    uv__cloexec(stdin_pipe[0], 1);
+    uv__cloexec(stdin_pipe[1], 1);
   }
 
   if (options.stdout_stream) {
@@ -2233,6 +2240,8 @@ int uv_spawn(uv_process_t* process, uv_process_options_t options) {
     if (pipe(stdout_pipe) < 0) {
       goto error;
     }
+    uv__cloexec(stdout_pipe[0], 1);
+    uv__cloexec(stdout_pipe[1], 1);
   }
 
   if (options.stderr_stream) {
@@ -2244,6 +2253,8 @@ int uv_spawn(uv_process_t* process, uv_process_options_t options) {
     if (pipe(stderr_pipe) < 0) {
       goto error;
     }
+    uv__cloexec(stderr_pipe[0], 1);
+    uv__cloexec(stderr_pipe[1], 1);
   }
 
   /* This pipe is used by the parent to wait until
@@ -2266,11 +2277,12 @@ int uv_spawn(uv_process_t* process, uv_process_options_t options) {
    * marked close-on-exec. Then, after the call to `fork()`,
    * the parent polls the read end until it sees POLLHUP.
    */
-#ifdef HAVE_PIPE2
+#if SPAWN_WAIT_EXEC
+# ifdef HAVE_PIPE2
   if (pipe2(signal_pipe, O_CLOEXEC | O_NONBLOCK) < 0) {
     goto error;
   }
-#else
+# else
   if (pipe(signal_pipe) < 0) {
     goto error;
   }
@@ -2278,13 +2290,16 @@ int uv_spawn(uv_process_t* process, uv_process_options_t options) {
   uv__cloexec(signal_pipe[1], 1);
   uv__nonblock(signal_pipe[0], 1);
   uv__nonblock(signal_pipe[1], 1);
+# endif
 #endif
 
   pid = fork();
 
   if (pid == -1) {
+#if SPAWN_WAIT_EXEC
     uv__close(signal_pipe[0]);
     uv__close(signal_pipe[1]);
+#endif
     environ = save_our_env;
     goto error;
   }
@@ -2323,6 +2338,7 @@ int uv_spawn(uv_process_t* process, uv_process_options_t options) {
   /* Restore environment. */
   environ = save_our_env;
 
+#if SPAWN_WAIT_EXEC
   /* POLLHUP signals child has exited or execve()'d. */
   uv__close(signal_pipe[1]);
   do {
@@ -2334,11 +2350,13 @@ int uv_spawn(uv_process_t* process, uv_process_options_t options) {
   while (status == -1 && (errno == EINTR || errno == ENOMEM));
 
   uv__close(signal_pipe[0]);
+  uv__close(signal_pipe[1]);
 
   assert((status == 1)
       && "poll() on pipe read end failed");
   assert((pfd.revents & POLLHUP) == POLLHUP
       && "no POLLHUP on pipe read end");
+#endif
 
   process->pid = pid;
 
diff --git a/deps/uv/test/benchmark-pound.c b/deps/uv/test/benchmark-pound.c
index 5528ab6f1c..8256ad3f81 100644
--- a/deps/uv/test/benchmark-pound.c
+++ b/deps/uv/test/benchmark-pound.c
@@ -25,6 +25,7 @@
 /* Update this is you're going to run > 1000 concurrent requests. */
 #define MAX_CONNS 1000
 
+#undef NANOSEC
 #define NANOSEC ((uint64_t)10e8)
 
 /* Base class for tcp_conn_rec and pipe_conn_rec.