Browse Source

Upgrade libuv to d91b5012bd32b60f1a0f35241f7ac45c147f0c8a

v0.7.4-release
Ryan Dahl 14 years ago
parent
commit
d3426789d2
  1. 7
      deps/uv/test/test-timer-again.c
  2. 9
      deps/uv/uv-unix.c

7
deps/uv/test/test-timer-again.c

@ -77,12 +77,7 @@ static void repeat_2_cb(uv_handle_t* handle, int status) {
repeat_2_cb_called++;
if (uv_timer_get_repeat(handle) == 0) {
/* XXX Libev does considers the timer active here.
* 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));
ASSERT(!uv_is_active(handle));
uv_close(handle);
return;
}

9
deps/uv/uv-unix.c

@ -1092,10 +1092,17 @@ int uv_idle_stop(uv_handle_t* handle) {
int uv_is_active(uv_handle_t* handle) {
switch (handle->type) {
case UV_TIMER:
return ev_is_active(&handle->timer_watcher);
case UV_PREPARE:
return ev_is_active(&handle->prepare_watcher);
case UV_CHECK:
return ev_is_active(&handle->check_watcher);
case UV_IDLE:
return ev_is_active(handle);
return ev_is_active(&handle->idle_watcher);
default:
return 1;

Loading…
Cancel
Save