summaryrefslogtreecommitdiff
path: root/server.c
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2020-06-20 12:53:25 +0200
committerDavid Härdeman <david@hardeman.nu>2020-06-20 12:53:25 +0200
commite11014c0443ea687ad65a14b9124aa366da7984a (patch)
tree8c6642ed187dc71cc672cec9f3459aa75134eaa5 /server.c
parentfc25e880dfb1f804742006bcdd15ac70d18b4144 (diff)
Introduce helper for checking if a task is dead
Diffstat (limited to 'server.c')
-rw-r--r--server.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/server.c b/server.c
index c4bbc0c..edb0551 100644
--- a/server.c
+++ b/server.c
@@ -195,10 +195,7 @@ server_local_accept(struct cfg *cfg, struct uring_task *task, int res)
debug(DBG_SRV, "task %p, res %i, scfg %s\n", task, res, scfg->name);
- if (task->dead) {
- debug(DBG_SRV, "task dead\n");
- return;
- }
+ assert_task_alive(DBG_SRV, task);
if (res < 0) {
error("result was %i\n", res);
@@ -299,11 +296,8 @@ server_exec_done(struct cfg *cfg, struct uring_task *task, int res)
int r;
siginfo_t info;
- if (task->dead) {
- /* Should we leave child processes running? */
- debug(DBG_SRV, "task dead\n");
- goto out;
- }
+ /* Should we leave child processes running? */
+ assert_task_alive_or(DBG_SRV, task, goto out);
if (!(res & POLLIN)) {
error("unexpected result: %i\n", res);