diff options
| author | cjihrig <cjihrig@gmail.com> | 2016-11-16 13:49:21 -0500 |
|---|---|---|
| committer | cjihrig <cjihrig@gmail.com> | 2016-11-17 09:54:16 -0500 |
| commit | 1fca11e114409b114dc1a0d675841fe59636a4f2 (patch) | |
| tree | 03cef1cb9a7560b528ee616053cabb8ebd71a4ca /deps/uv/src/unix | |
| parent | 21826ef21ad9b1f3c67b93462fe098b94a83a311 (diff) | |
| download | android-node-v8-1fca11e114409b114dc1a0d675841fe59636a4f2.tar.gz android-node-v8-1fca11e114409b114dc1a0d675841fe59636a4f2.tar.bz2 android-node-v8-1fca11e114409b114dc1a0d675841fe59636a4f2.zip | |
deps: upgrade libuv to 1.10.1
Fixes: https://github.com/nodejs/node/issues/9542
Fixes: https://github.com/nodejs/node/issues/9546
PR-URL: https://github.com/nodejs/node/pull/9647
Reviewed-By: Imran Iqbal <imran@imraniqbal.org>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Diffstat (limited to 'deps/uv/src/unix')
| -rw-r--r-- | deps/uv/src/unix/core.c | 2 | ||||
| -rw-r--r-- | deps/uv/src/unix/poll.c | 4 | ||||
| -rw-r--r-- | deps/uv/src/unix/signal.c | 4 | ||||
| -rw-r--r-- | deps/uv/src/unix/stream.c | 3 |
4 files changed, 6 insertions, 7 deletions
diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c index a2c07e6a47..6283ed3ec2 100644 --- a/deps/uv/src/unix/core.c +++ b/deps/uv/src/unix/core.c @@ -98,7 +98,7 @@ uint64_t uv_hrtime(void) { void uv_close(uv_handle_t* handle, uv_close_cb close_cb) { - assert(!(handle->flags & (UV_CLOSING | UV_CLOSED))); + assert(!uv__is_closing(handle)); handle->flags |= UV_CLOSING; handle->close_cb = close_cb; diff --git a/deps/uv/src/unix/poll.c b/deps/uv/src/unix/poll.c index 4c0d478eee..370994bd57 100644 --- a/deps/uv/src/unix/poll.c +++ b/deps/uv/src/unix/poll.c @@ -92,7 +92,7 @@ static void uv__poll_stop(uv_poll_t* handle) { int uv_poll_stop(uv_poll_t* handle) { - assert(!(handle->flags & (UV_CLOSING | UV_CLOSED))); + assert(!uv__is_closing(handle)); uv__poll_stop(handle); return 0; } @@ -102,7 +102,7 @@ int uv_poll_start(uv_poll_t* handle, int pevents, uv_poll_cb poll_cb) { int events; assert((pevents & ~(UV_READABLE | UV_WRITABLE | UV_DISCONNECT)) == 0); - assert(!(handle->flags & (UV_CLOSING | UV_CLOSED))); + assert(!uv__is_closing(handle)); uv__poll_stop(handle); diff --git a/deps/uv/src/unix/signal.c b/deps/uv/src/unix/signal.c index ccc1847aae..dbd8f86448 100644 --- a/deps/uv/src/unix/signal.c +++ b/deps/uv/src/unix/signal.c @@ -290,7 +290,7 @@ int uv_signal_start(uv_signal_t* handle, uv_signal_cb signal_cb, int signum) { sigset_t saved_sigmask; int err; - assert(!(handle->flags & (UV_CLOSING | UV_CLOSED))); + assert(!uv__is_closing(handle)); /* If the user supplies signum == 0, then return an error already. If the * signum is otherwise invalid then uv__signal_register will find out @@ -434,7 +434,7 @@ static int uv__signal_compare(uv_signal_t* w1, uv_signal_t* w2) { int uv_signal_stop(uv_signal_t* handle) { - assert(!(handle->flags & (UV_CLOSING | UV_CLOSED))); + assert(!uv__is_closing(handle)); uv__signal_stop(handle); return 0; } diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c index d20d0bcb33..86f4eb7a5c 100644 --- a/deps/uv/src/unix/stream.c +++ b/deps/uv/src/unix/stream.c @@ -1221,8 +1221,7 @@ int uv_shutdown(uv_shutdown_t* req, uv_stream_t* stream, uv_shutdown_cb cb) { if (!(stream->flags & UV_STREAM_WRITABLE) || stream->flags & UV_STREAM_SHUT || stream->flags & UV_STREAM_SHUTTING || - stream->flags & UV_CLOSED || - stream->flags & UV_CLOSING) { + uv__is_closing(stream)) { return -ENOTCONN; } |