static int poll_fd = -1;
bool uloop_cancelled = false;
-bool uloop_handle_sigchld = true;
static bool do_sigchld = false;
static struct uloop_fd_event cur_fds[ULOOP_MAX_EVENTS];
if (timeout->pending)
uloop_timeout_cancel(timeout);
- uloop_gettime(&timeout->time);
+ uloop_gettime(time);
time->tv_sec += msecs / 1000;
time->tv_usec += (msecs % 1000) * 1000;
if (time->tv_usec > 1000000) {
time->tv_sec++;
- time->tv_usec %= 1000000;
+ time->tv_usec -= 1000000;
}
return uloop_timeout_add(timeout);
do_sigchld = true;
}
-static void uloop_setup_signals(bool add)
+static void uloop_install_handler(int signum, void (*handler)(int), struct sigaction* old, bool add)
{
- static struct sigaction old_sigint, old_sigchld;
struct sigaction s;
+ struct sigaction *act;
- memset(&s, 0, sizeof(struct sigaction));
+ act = NULL;
+ sigaction(signum, NULL, &s);
if (add) {
- s.sa_handler = uloop_handle_sigint;
- s.sa_flags = 0;
+ if (s.sa_handler == SIG_DFL) { /* Do not override existing custom signal handlers */
+ memcpy(old, &s, sizeof(struct sigaction));
+ s.sa_handler = handler;
+ s.sa_flags = 0;
+ act = &s;
+ }
+ }
+ else if (s.sa_handler == handler) { /* Do not restore if someone modified our handler */
+ act = old;
+ }
+
+ if (act != NULL)
+ sigaction(signum, act, NULL);
+}
+
+static void uloop_ignore_signal(int signum, bool ignore)
+{
+ struct sigaction s;
+ void *new_handler = NULL;
+
+ sigaction(signum, NULL, &s);
+
+ if (ignore) {
+ if (s.sa_handler == SIG_DFL) /* Ignore only if there isn't any custom handler */
+ new_handler = SIG_IGN;
} else {
- s = old_sigint;
+ if (s.sa_handler == SIG_IGN) /* Restore only if noone modified our SIG_IGN */
+ new_handler = SIG_DFL;
}
- sigaction(SIGINT, &s, &old_sigint);
+ if (new_handler) {
+ s.sa_handler = new_handler;
+ s.sa_flags = 0;
+ sigaction(signum, &s, NULL);
+ }
+}
- if (!uloop_handle_sigchld)
- return;
+static void uloop_setup_signals(bool add)
+{
+ static struct sigaction old_sigint, old_sigchld, old_sigterm;
- if (add)
- s.sa_handler = uloop_sigchld;
- else
- s = old_sigchld;
+ 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);
- sigaction(SIGCHLD, &s, &old_sigchld);
+ uloop_ignore_signal(SIGPIPE, add);
}
static int uloop_get_next_timeout(struct timeval *tv)
{
uloop_gettime(&tv);
uloop_process_timeouts(&tv);
- if (uloop_cancelled)
- break;
if (do_sigchld)
uloop_handle_processes();
+
+ if (uloop_cancelled)
+ break;
+
uloop_gettime(&tv);
uloop_run_events(uloop_get_next_timeout(&tv));
}