diff options
author | cjihrig <cjihrig@gmail.com> | 2018-07-09 22:16:25 -0400 |
---|---|---|
committer | cjihrig <cjihrig@gmail.com> | 2018-07-10 21:47:58 -0400 |
commit | 8174d0c8cae857296c45b2c448348f2c781f6ace (patch) | |
tree | ca064ff21bac35295fc7b0e052530f87e5b3931d /deps/uv/src/unix/core.c | |
parent | 9d71619bbee7c198cb20ec4702024ac983b5db7d (diff) | |
download | android-node-v8-8174d0c8cae857296c45b2c448348f2c781f6ace.tar.gz android-node-v8-8174d0c8cae857296c45b2c448348f2c781f6ace.tar.bz2 android-node-v8-8174d0c8cae857296c45b2c448348f2c781f6ace.zip |
deps: upgrade to libuv 1.22.0
PR-URL: https://github.com/nodejs/node/pull/21731
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'deps/uv/src/unix/core.c')
-rw-r--r-- | deps/uv/src/unix/core.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c index c2e7bd730d..066c9bee32 100644 --- a/deps/uv/src/unix/core.c +++ b/deps/uv/src/unix/core.c @@ -116,7 +116,7 @@ uint64_t uv_hrtime(void) { void uv_close(uv_handle_t* handle, uv_close_cb close_cb) { assert(!uv__is_closing(handle)); - handle->flags |= UV_CLOSING; + handle->flags |= UV_HANDLE_CLOSING; handle->close_cb = close_cb; switch (handle->type) { @@ -214,8 +214,8 @@ int uv__socket_sockopt(uv_handle_t* handle, int optname, int* value) { } void uv__make_close_pending(uv_handle_t* handle) { - assert(handle->flags & UV_CLOSING); - assert(!(handle->flags & UV_CLOSED)); + assert(handle->flags & UV_HANDLE_CLOSING); + assert(!(handle->flags & UV_HANDLE_CLOSED)); handle->next_closing = handle->loop->closing_handles; handle->loop->closing_handles = handle; } @@ -241,15 +241,17 @@ int uv__getiovmax(void) { static void uv__finish_close(uv_handle_t* handle) { - /* Note: while the handle is in the UV_CLOSING state now, it's still possible - * for it to be active in the sense that uv__is_active() returns true. + /* Note: while the handle is in the UV_HANDLE_CLOSING state now, it's still + * possible for it to be active in the sense that uv__is_active() returns + * true. + * * A good example is when the user calls uv_shutdown(), immediately followed * by uv_close(). The handle is considered active at this point because the * completion of the shutdown req is still pending. */ - assert(handle->flags & UV_CLOSING); - assert(!(handle->flags & UV_CLOSED)); - handle->flags |= UV_CLOSED; + assert(handle->flags & UV_HANDLE_CLOSING); + assert(!(handle->flags & UV_HANDLE_CLOSED)); + handle->flags |= UV_HANDLE_CLOSED; switch (handle->type) { case UV_PREPARE: |