Upgrade libuv to bd6066cb

diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c
index 8569eae..45fef16 100644 (file)
--- a/deps/uv/src/unix/core.c
+++ b/deps/uv/src/unix/core.c
@@ -235,8 +235,6 @@ void uv__finish_close(uv_handle_t* handle) {
     case UV_TCP:
       assert(!ev_is_active(&((uv_stream_t*)handle)->read_watcher));
       assert(!ev_is_active(&((uv_stream_t*)handle)->write_watcher));
-      assert(((uv_stream_t*)handle)->fd == -1);
-      uv__stream_destroy((uv_stream_t*)handle);
       break;
 
     case UV_UDP:

diff --git a/deps/uv/src/unix/fs.c b/deps/uv/src/unix/fs.c
index 85cfbfb..cab4106 100644 (file)
--- a/deps/uv/src/unix/fs.c
+++ b/deps/uv/src/unix/fs.c
@@ -85,7 +85,8 @@ void uv_fs_req_cleanup(uv_fs_t* req) {
 
   switch (req->fs_type) {
     case UV_FS_READDIR:
-      assert(req->ptr);
+      assert((req->result == -1 && req->ptr == NULL)
+          || (req->result >= 0 && req->ptr != NULL));
       free(req->ptr);
       req->ptr = NULL;
       break;

diff --git a/deps/uv/src/unix/internal.h b/deps/uv/src/unix/internal.h
index 9d62e6f..024a9b3 100644 (file)
--- a/deps/uv/src/unix/internal.h
+++ b/deps/uv/src/unix/internal.h
@@ -81,7 +81,6 @@ void uv_fatal_error(const int errorno, const char* syscall);
 
 /* stream */
 int uv__stream_open(uv_stream_t*, int fd, int flags);
-void uv__stream_destroy(uv_stream_t* stream);
 void uv__stream_io(EV_P_ ev_io* watcher, int revents);
 void uv__server_io(EV_P_ ev_io* watcher, int revents);
 int uv__accept(int sockfd, struct sockaddr* saddr, socklen_t len);

diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c
index c6aa56c..0b5a2a4 100644 (file)
--- a/deps/uv/src/unix/stream.c
+++ b/deps/uv/src/unix/stream.c
@@ -75,35 +75,6 @@ int uv__stream_open(uv_stream_t* stream, int fd, int flags) {
 }
 
 
-/* Clears out the write queue, invokes the callbacks attached
- * to each write request. Used when a stream is destroyed.
- */
-static void uv__clear_queue(ngx_queue_t* wq, int status, uv_err_code code) {
-  uv_write_t* req;
-  ngx_queue_t* q;
-
-  while (!ngx_queue_empty(wq)) {
-    q = ngx_queue_head(wq);
-    ngx_queue_remove(q);
-
-    req = ngx_queue_data(q, uv_write_t, queue);
-    if (req->cb) {
-      uv_err_new(req->handle->loop, code);
-      req->cb(req, status);
-    }
-
-    if (req->bufs != req->bufsml)
-      free(req->bufs);
-  }
-}
-
-
-void uv__stream_destroy(uv_stream_t* stream) {
-  uv__clear_queue(&stream->write_queue, -1, UV_EINTR);
-  uv__clear_queue(&stream->write_completed_queue, 0, UV_OK);
-}
-
-
 void uv__server_io(EV_P_ ev_io* watcher, int revents) {
   int fd;
   struct sockaddr_storage addr;

diff --git a/deps/uv/test/test-list.h b/deps/uv/test/test-list.h
index d510be2..0c74310 100644 (file)
--- a/deps/uv/test/test-list.h
+++ b/deps/uv/test/test-list.h
@@ -31,7 +31,6 @@ TEST_DECLARE   (tcp_bind_error_fault)
 TEST_DECLARE   (tcp_bind_error_inval)
 TEST_DECLARE   (tcp_bind_localhost_ok)
 TEST_DECLARE   (tcp_listen_without_bind)
-TEST_DECLARE   (tcp_close)
 TEST_DECLARE   (tcp_bind6_error_addrinuse)
 TEST_DECLARE   (tcp_bind6_error_addrnotavail)
 TEST_DECLARE   (tcp_bind6_error_fault)
@@ -118,7 +117,6 @@ TASK_LIST_START
   TEST_ENTRY  (tcp_bind_error_inval)
   TEST_ENTRY  (tcp_bind_localhost_ok)
   TEST_ENTRY  (tcp_listen_without_bind)
-  TEST_ENTRY  (tcp_close)
 
   TEST_ENTRY  (tcp_bind6_error_addrinuse)
   TEST_ENTRY  (tcp_bind6_error_addrnotavail)

diff --git a/deps/uv/test/test-tcp-close.c b/deps/uv/test/test-tcp-close.c
deleted file mode 100644 (file)
index 3f39393..0000000
--- a/deps/uv/test/test-tcp-close.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* 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;
-
-  uv_init();
-  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;
-}

diff --git a/deps/uv/uv.gyp b/deps/uv/uv.gyp
index 709f6b6..0735234 100644 (file)
--- a/deps/uv/uv.gyp
+++ b/deps/uv/uv.gyp
@@ -245,7 +245,6 @@
         'test/test-spawn.c',
         'test/test-tcp-bind-error.c',
         'test/test-tcp-bind6-error.c',
-        'test/test-tcp-close.c',
         'test/test-tcp-writealot.c',
         'test/test-threadpool.c',
         'test/test-timer-again.c',