Upgrade libuv to bd6066cb

nodejs · Sep 9, 2011 · 0a72ac3 · 0a72ac3
1 parent 79ce48d
commit 0a72ac3
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 166 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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',