From e11014c0443ea687ad65a14b9124aa366da7984a Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Sat, 20 Jun 2020 12:53:25 +0200 Subject: Introduce helper for checking if a task is dead --- server.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'server.c') 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); -- cgit v1.2.3