static int poll_fd = -1;
bool uloop_cancelled = false;
+bool uloop_handle_sigchld = true;
static int uloop_status = 0;
static bool do_sigchld = false;
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;
}
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);
}
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;
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;