morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2961 from evverx/fix-activate-sigchld

Browse Source 
activate: improve SIGCHLD handler
This commit is contained in:
Lennart Poettering
2016-04-06 10:46:47 +02:00
parent 0c0d058325 5488e52d28
commit d35da3ae6a
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/activate/activate.c
View File

@@ -316,19 +316,31 @@ static int do_accept(const char* name, char **argv, char **envp, int fd) {
}
/* SIGCHLD handler. */
static void sigchld_hdl(int sig, siginfo_t *t, void *data) {
static void sigchld_hdl(int sig) {
PROTECT_ERRNO;
log_info("Child %d died with code %d", t->si_pid, t->si_status);
for (;;) {
siginfo_t si;
int r;
/* Wait for a dead child. */
(void) waitpid(t->si_pid, NULL, 0);
si.si_pid = 0;
r = waitid(P_ALL, 0, &si, WEXITED|WNOHANG);
if (r < 0) {
if (errno != ECHILD)
log_error_errno(errno, "Failed to reap children: %m");
return;
}
if (si.si_pid == 0)
return;
log_info("Child %d died with code %d", si.si_pid, si.si_status);
}
}
static int install_chld_handler(void) {
static const struct sigaction act = {
.sa_flags = SA_SIGINFO,
.sa_sigaction = sigchld_hdl,
.sa_flags = SA_NOCLDSTOP,
.sa_handler = sigchld_hdl,
};
int r;