Upgrade libuv to d91b5012bd32b60f1a0f35241f7ac45c147f0c8a
This commit is contained in:
parent
2c79f13634
commit
d3426789d2
7
deps/uv/test/test-timer-again.c
vendored
7
deps/uv/test/test-timer-again.c
vendored
@ -77,12 +77,7 @@ static void repeat_2_cb(uv_handle_t* handle, int status) {
|
|||||||
repeat_2_cb_called++;
|
repeat_2_cb_called++;
|
||||||
|
|
||||||
if (uv_timer_get_repeat(handle) == 0) {
|
if (uv_timer_get_repeat(handle) == 0) {
|
||||||
/* XXX Libev does considers the timer active here.
|
ASSERT(!uv_is_active(handle));
|
||||||
* I'm not saying it must be this way, but we should consider what
|
|
||||||
* exactly the semantics of uv_is_active() should be. Is a timer that's
|
|
||||||
* initialized but stopped active?
|
|
||||||
*/
|
|
||||||
ASSERT(uv_is_active(handle));
|
|
||||||
uv_close(handle);
|
uv_close(handle);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
9
deps/uv/uv-unix.c
vendored
9
deps/uv/uv-unix.c
vendored
@ -1092,10 +1092,17 @@ int uv_idle_stop(uv_handle_t* handle) {
|
|||||||
|
|
||||||
int uv_is_active(uv_handle_t* handle) {
|
int uv_is_active(uv_handle_t* handle) {
|
||||||
switch (handle->type) {
|
switch (handle->type) {
|
||||||
|
case UV_TIMER:
|
||||||
|
return ev_is_active(&handle->timer_watcher);
|
||||||
|
|
||||||
case UV_PREPARE:
|
case UV_PREPARE:
|
||||||
|
return ev_is_active(&handle->prepare_watcher);
|
||||||
|
|
||||||
case UV_CHECK:
|
case UV_CHECK:
|
||||||
|
return ev_is_active(&handle->check_watcher);
|
||||||
|
|
||||||
case UV_IDLE:
|
case UV_IDLE:
|
||||||
return ev_is_active(handle);
|
return ev_is_active(&handle->idle_watcher);
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return 1;
|
return 1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user