aboutsummaryrefslogtreecommitdiff
path: root/reaper.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-01-20 16:47:05 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-01-20 16:47:05 +0000
commitc5031be4899ea516635ef7c65a6f82b3b45860b9 (patch)
tree10948eb4aface28e80d6a075fecf11fad3075618 /reaper.c
parentMerge branch 'decset-1047-and-1048' (diff)
parentdebug: rename assert() to xassert(), to avoid clashing with <assert.h> (diff)
Merge branch 'stacktrace'
Diffstat (limited to 'reaper.c')
-rw-r--r--reaper.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/reaper.c b/reaper.c
index 9d98854e..dec15cb2 100644
--- a/reaper.c
+++ b/reaper.c
@@ -5,11 +5,12 @@
#include <sys/epoll.h>
#include <sys/wait.h>
#include <sys/signalfd.h>
+#include <tllist.h>
#define LOG_MODULE "reaper"
#define LOG_ENABLE_DBG 0
#include "log.h"
-#include "tllist.h"
+#include "debug.h"
struct child {
pid_t pid;
@@ -120,7 +121,7 @@ fdm_reap(struct fdm *fdm, int fd, int events, void *data)
if (hup && !pollin)
return false;
- assert(pollin);
+ xassert(pollin);
struct signalfd_siginfo info;
ssize_t amount = read(reaper->fd, &info, sizeof(info));
@@ -130,7 +131,7 @@ fdm_reap(struct fdm *fdm, int fd, int events, void *data)
return false;
}
- assert((size_t)amount >= sizeof(info));
+ xassert((size_t)amount >= sizeof(info));
if (info.ssi_signo != SIGCHLD) {
LOG_WARN("got non-SIGCHLD signal: %d", info.ssi_signo);