return 0;
}
+static void uloop_setup_signals(bool add);
+
int uloop_init(void)
{
if (uloop_init_pollfd() < 0)
return -1;
}
+ uloop_setup_signals(true);
+
return 0;
}
return uloop_run_depth > 0 && uloop_cancelled;
}
-int uloop_run(void)
+int uloop_run_timeout(int timeout)
{
+ int next_time = 0;
struct timeval tv;
- /*
- * Handlers are only updated for the first call to uloop_run() (and restored
- * when this call is done).
- */
- if (!uloop_run_depth++)
- uloop_setup_signals(true);
+ uloop_run_depth++;
uloop_status = 0;
uloop_cancelled = false;
break;
uloop_gettime(&tv);
- uloop_run_events(uloop_get_next_timeout(&tv));
+
+ next_time = uloop_get_next_timeout(&tv);
+ if (timeout >= 0 && timeout < next_time)
+ next_time = timeout;
+ uloop_run_events(next_time);
}
- if (!--uloop_run_depth)
- uloop_setup_signals(false);
+ --uloop_run_depth;
return uloop_status;
}
void uloop_done(void)
{
+ uloop_setup_signals(false);
+
if (poll_fd >= 0) {
close(poll_fd);
poll_fd = -1;