static int poll_fd = -1;
bool uloop_cancelled = false;
+bool uloop_handle_sigchld = true;
+static int uloop_status = 0;
static bool do_sigchld = false;
static struct uloop_fd_event cur_fds[ULOOP_MAX_EVENTS];
static int cur_fd, cur_nfds;
+static int uloop_run_depth = 0;
int uloop_fd_add(struct uloop_fd *sock, unsigned int flags);
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;
}
static void uloop_signal_wake(void)
{
- write(waker_pipe, "w", 1);
+ do {
+ if (write(waker_pipe, "w", 1) < 0) {
+ if (errno == EINTR)
+ continue;
+ }
+ break;
+ } while (1);
}
static void uloop_handle_sigint(int signo)
{
+ uloop_status = signo;
uloop_cancelled = true;
uloop_signal_wake();
}
uloop_install_handler(SIGINT, uloop_handle_sigint, &old_sigint, add);
uloop_install_handler(SIGTERM, uloop_handle_sigint, &old_sigterm, add);
- uloop_install_handler(SIGCHLD, uloop_sigchld, &old_sigchld, add);
+
+ if (uloop_handle_sigchld)
+ uloop_install_handler(SIGCHLD, uloop_sigchld, &old_sigchld, add);
uloop_ignore_signal(SIGPIPE, add);
}
uloop_process_delete(p);
}
-void uloop_run(void)
+bool uloop_cancelling(void)
{
- static int recursive_calls = 0;
+ return uloop_run_depth > 0 && uloop_cancelled;
+}
+
+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 (!recursive_calls++)
- uloop_setup_signals(true);
+ uloop_run_depth++;
+ uloop_status = 0;
uloop_cancelled = false;
- while(!uloop_cancelled)
+ while (!uloop_cancelled)
{
uloop_gettime(&tv);
uloop_process_timeouts(&tv);
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 (!--recursive_calls)
- 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;