mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-03 15:41:54 +00:00
Code Releases Activity

Flock: Zombie children reaping

Browse Source
This commit is contained in:
Maria Matejka 2024-09-11 13:03:02 +02:00
parent 19dae2c622
commit 6f3c5339e7
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
flock/flock.c
View File

@ -41,8 +41,37 @@ poweroff_event_hook(void *data UNUSED)
ev_run_list(&shutdown_event_list); ev_run_list(&shutdown_event_list);
} }
static void
child_event_hook(void *data UNUSED)
{
log(L_INFO "Zombie elimination routine invoked.");
while (1) {
int status;
pid_t p = waitpid(-1, &status, WNOHANG);
if (p < 0)
{
log(L_ERR "Zombie elimination failed: %m");
return;
}
if (p == 0)
return;
const char *coreinfo = WCOREDUMP(status) ? " (core dumped)" : "";
if (WIFEXITED(status))
log(L_INFO "Process %d ended with status %d%s", p, WEXITSTATUS(status), coreinfo);
else if (WIFSIGNALED(status))
log(L_INFO "Process %d exited by signal %d (%s)%s", p, WTERMSIG(status), strsignal(WTERMSIG(status)), coreinfo);
else
log(L_ERR "Process %d exited with a strange status %d", p, status);
}
}
event reboot_event = { .hook = reboot_event_hook }, event reboot_event = { .hook = reboot_event_hook },
poweroff_event = { .hook = poweroff_event_hook }; poweroff_event = { .hook = poweroff_event_hook },
child_event = { .hook = child_event_hook };
callback shutdown_done_callback; callback shutdown_done_callback;
@ -89,6 +118,11 @@ hypervisor_fail_sighandler(int signo UNUSED)
_exit(1); _exit(1);
} }
static void
hypervisor_child_sighandler(int signo UNUSED)
{
ev_send_loop(&main_birdloop, &child_event);
}
/* /*
* The Main. * The Main.
@ -236,6 +270,7 @@ main(int argc, char **argv, char **argh UNUSED)
signal(SIGINT, hypervisor_poweroff_sighandler); signal(SIGINT, hypervisor_poweroff_sighandler);
signal(SIGHUP, hypervisor_reboot_sighandler); signal(SIGHUP, hypervisor_reboot_sighandler);
signal(SIGQUIT, hypervisor_fail_sighandler); signal(SIGQUIT, hypervisor_fail_sighandler);
signal(SIGCHLD, hypervisor_child_sighandler);
/* Unblock signals */ /* Unblock signals */
sigprocmask(SIG_SETMASK, &oldmask, NULL); sigprocmask(SIG_SETMASK, &oldmask, NULL);

12
flock/hypervisor.c
View File

@ -239,7 +239,7 @@ hypervisor_exposed_child_rx(sock *sk, uint size UNUSED)
} }
/* Only one thing is actually supported for now: opening a listening socket */ /* Only one thing is actually supported for now: opening a listening socket */
int sfd = socket(AF_INET6, SOCK_STREAM, 0); int sfd = socket(AF_INET6, SOCK_STREAM | SOCK_CLOEXEC, 0);
if (sfd < 0) if (sfd < 0)
{ {
log(L_ERR "Failed to socket(): %m"); log(L_ERR "Failed to socket(): %m");
@ -260,7 +260,6 @@ hypervisor_exposed_child_rx(sock *sk, uint size UNUSED)
}, },
}; };
int e = bind(sfd, &sin.a, sizeof sin); int e = bind(sfd, &sin.a, sizeof sin);
if (e < 0) if (e < 0)
if (errno == EADDRINUSE) if (errno == EADDRINUSE)
@ -317,8 +316,15 @@ hypervisor_exposed_child_rx(sock *sk, uint size UNUSED)
} }
static void static void
hypervisor_exposed_child_err(sock *sk UNUSED, int e UNUSED) hypervisor_exposed_child_err(sock *sk, int e)
{ {
if (e == 0)
log(L_INFO "Exposed child exiting OK");
else
log(L_ERR "Exposed child control socket failure: %s", strerror(e));
sk_close(sk);
exit(!!e);
} }
/** /**