mirror of
https://codeberg.org/dnkl/foot.git
synced 2026-02-05 04:06:08 -05:00
reaper: new module, uses a signalfd to wait() on child processes
Use a signalfd to listen for SIGCHLD signals. When we receive a SIGCHLD over the signalfd, reap all dead children by looping over all registered child PIDs and call waitpid(WNOHANG) on them.
This commit is contained in:
parent
5600cc68c0
commit
f49742ebba
4 changed files with 161 additions and 0 deletions
142
reaper.c
Normal file
142
reaper.c
Normal file
|
|
@ -0,0 +1,142 @@
|
|||
#include "reaper.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/epoll.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/signalfd.h>
|
||||
|
||||
#define LOG_MODULE "reaper"
|
||||
#define LOG_ENABLE_DBG 1
|
||||
#include "log.h"
|
||||
#include "tllist.h"
|
||||
|
||||
struct reaper {
|
||||
struct fdm *fdm;
|
||||
int fd;
|
||||
tll(pid_t) children;
|
||||
};
|
||||
|
||||
static bool fdm_reap(struct fdm *fdm, int fd, int events, void *data);
|
||||
|
||||
struct reaper *
|
||||
reaper_init(struct fdm *fdm)
|
||||
{
|
||||
sigset_t mask;
|
||||
sigemptyset(&mask);
|
||||
sigaddset(&mask, SIGCHLD);
|
||||
|
||||
/* Block normal signal handling - we're using a signalfd instead */
|
||||
if (sigprocmask(SIG_BLOCK, &mask, NULL) < 0) {
|
||||
LOG_ERRNO("failed to block SIGCHLD");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int fd = signalfd(-1, &mask, SFD_NONBLOCK | SFD_CLOEXEC);
|
||||
if (fd < 0) {
|
||||
LOG_ERRNO("failed to create signal FD");
|
||||
sigprocmask(SIG_UNBLOCK, &mask, NULL);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
struct reaper *reaper = malloc(sizeof(*reaper));
|
||||
*reaper = (struct reaper){
|
||||
.fdm = fdm,
|
||||
.fd = fd,
|
||||
.children = tll_init(),
|
||||
};
|
||||
|
||||
if (!fdm_add(fdm, fd, EPOLLIN, &fdm_reap, reaper)){
|
||||
LOG_ERR("failed to register with the FDM");
|
||||
goto err;
|
||||
}
|
||||
|
||||
return reaper;
|
||||
|
||||
err:
|
||||
tll_free(reaper->children);
|
||||
close(fd);
|
||||
free(reaper);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void
|
||||
reaper_destroy(struct reaper *reaper)
|
||||
{
|
||||
if (reaper == NULL)
|
||||
return;
|
||||
|
||||
fdm_del(reaper->fdm, reaper->fd);
|
||||
tll_free(reaper->children);
|
||||
free(reaper);
|
||||
|
||||
sigset_t mask;
|
||||
sigemptyset(&mask);
|
||||
sigaddset(&mask, SIGCHLD);
|
||||
sigprocmask(SIG_UNBLOCK, &mask, NULL);
|
||||
}
|
||||
|
||||
void
|
||||
reaper_add(struct reaper *reaper, pid_t pid)
|
||||
{
|
||||
LOG_DBG("adding pid=%d", pid);
|
||||
tll_push_back(reaper->children, pid);
|
||||
}
|
||||
|
||||
static bool
|
||||
fdm_reap(struct fdm *fdm, int fd, int events, void *data)
|
||||
{
|
||||
struct reaper *reaper = data;
|
||||
|
||||
bool pollin = events & EPOLLIN;
|
||||
bool hup = events & EPOLLHUP;
|
||||
|
||||
if (hup && !pollin)
|
||||
return false;
|
||||
|
||||
assert(pollin);
|
||||
|
||||
struct signalfd_siginfo info;
|
||||
ssize_t amount = read(reaper->fd, &info, sizeof(info));
|
||||
|
||||
if (amount < 0) {
|
||||
LOG_ERRNO("failed to read");
|
||||
return false;
|
||||
}
|
||||
|
||||
assert((size_t)amount >= sizeof(info));
|
||||
|
||||
if (info.ssi_signo != SIGCHLD) {
|
||||
LOG_WARN("got non-SIGCHLD signal: %d", info.ssi_signo);
|
||||
return true;
|
||||
}
|
||||
|
||||
tll_foreach(reaper->children, it) {
|
||||
/* Don't use wait() since we don't want to accidentaly reap
|
||||
* the PTS slave */
|
||||
|
||||
pid_t pid = it->item;
|
||||
|
||||
int result;
|
||||
int res = waitpid(pid, &result, WNOHANG);
|
||||
|
||||
if (res <= 0) {
|
||||
if (res < 0)
|
||||
LOG_ERRNO("waitpid failed for pid=%d", pid);
|
||||
continue;
|
||||
}
|
||||
|
||||
else if (WIFEXITED(result))
|
||||
LOG_DBG("pid=%d: exited with status=%d", pid, WEXITSTATUS(result));
|
||||
else if (WIFSIGNALED(result))
|
||||
LOG_DBG("pid=%d: killed by signal=%d", pid, WTERMSIG(result));
|
||||
else
|
||||
LOG_DBG("pid=%d: died of unknown resason", pid);
|
||||
tll_remove(reaper->children, it);
|
||||
}
|
||||
|
||||
if (hup)
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue