aboutsummaryrefslogtreecommitdiff
path: root/deps/uv/src
diff options
context:
space:
mode:
authorFedor Indutny <fedor.indutny@gmail.com>2012-12-18 14:14:38 +0400
committerFedor Indutny <fedor.indutny@gmail.com>2012-12-18 14:15:02 +0400
commitba754524a9f6a729a337803aadd5f1b47af968b9 (patch)
treee4170a4b72257aa7b136edc96e8b2cb4582b1932 /deps/uv/src
parent82c7c84e2550e79b816f87cd1dff3fe4cafb6bbb (diff)
downloadandroid-node-v8-ba754524a9f6a729a337803aadd5f1b47af968b9.tar.gz
android-node-v8-ba754524a9f6a729a337803aadd5f1b47af968b9.tar.bz2
android-node-v8-ba754524a9f6a729a337803aadd5f1b47af968b9.zip
deps: upgrade libuv to b86ed94
Diffstat (limited to 'deps/uv/src')
-rw-r--r--deps/uv/src/unix/kqueue.c8
-rw-r--r--deps/uv/src/unix/sunos.c2
-rw-r--r--deps/uv/src/unix/udp.c8
3 files changed, 10 insertions, 8 deletions
diff --git a/deps/uv/src/unix/kqueue.c b/deps/uv/src/unix/kqueue.c
index 73ee696e30..af9078e938 100644
--- a/deps/uv/src/unix/kqueue.c
+++ b/deps/uv/src/unix/kqueue.c
@@ -197,7 +197,9 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
/* TODO batch up */
struct kevent events[1];
EV_SET(events + 0, fd, ev->filter, EV_DELETE, 0, 0, 0);
- if (kevent(loop->backend_fd, events, 1, NULL, 0, NULL)) abort();
+ if (kevent(loop->backend_fd, events, 1, NULL, 0, NULL))
+ if (errno != ENOENT)
+ abort();
}
}
@@ -208,7 +210,9 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
/* TODO batch up */
struct kevent events[1];
EV_SET(events + 0, fd, ev->filter, EV_DELETE, 0, 0, 0);
- if (kevent(loop->backend_fd, events, 1, NULL, 0, NULL)) abort();
+ if (kevent(loop->backend_fd, events, 1, NULL, 0, NULL))
+ if (errno != ENOENT)
+ abort();
}
}
diff --git a/deps/uv/src/unix/sunos.c b/deps/uv/src/unix/sunos.c
index 744fea7775..48b1fca171 100644
--- a/deps/uv/src/unix/sunos.c
+++ b/deps/uv/src/unix/sunos.c
@@ -376,7 +376,7 @@ int uv_fs_event_init(uv_loop_t* loop,
void uv__fs_event_close(uv_fs_event_t* handle) {
- if (handle->fd == PORT_FIRED) {
+ if (handle->fd == PORT_FIRED || handle->fd == PORT_LOADED) {
port_dissociate(handle->loop->fs_fd, PORT_SOURCE_FILE, (uintptr_t)&handle->fo);
}
handle->fd = PORT_DELETED;
diff --git a/deps/uv/src/unix/udp.c b/deps/uv/src/unix/udp.c
index 7a970ba0ea..4b242f6466 100644
--- a/deps/uv/src/unix/udp.c
+++ b/deps/uv/src/unix/udp.c
@@ -446,14 +446,12 @@ static int uv__udp_send(uv_udp_send_t* req,
int uv_udp_init(uv_loop_t* loop, uv_udp_t* handle) {
- memset(handle, 0, sizeof *handle);
-
uv__handle_init(loop, (uv_handle_t*)handle, UV_UDP);
- handle->io_watcher.fd = -1;
+ handle->alloc_cb = NULL;
+ handle->recv_cb = NULL;
+ uv__io_init(&handle->io_watcher, uv__udp_io, -1);
ngx_queue_init(&handle->write_queue);
ngx_queue_init(&handle->write_completed_queue);
- uv__io_init(&handle->io_watcher, uv__udp_io, -1);
-
return 0;
}