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 --- cfgdir.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'cfgdir.c') diff --git a/cfgdir.c b/cfgdir.c index 364f58e..fc1633b 100644 --- a/cfgdir.c +++ b/cfgdir.c @@ -341,8 +341,7 @@ scfg_read_cb(struct cfg *cfg, struct uring_task *task, int res) { struct server *scfg = container_of(task, struct server, task); - if (task->dead) - return; + assert_task_alive(DBG_CFG, task); if (res <= 0) { error("error reading config file for %s: %s\n", @@ -361,10 +360,7 @@ scfg_open_cb(struct cfg *cfg, struct uring_task *task, int res) { struct server *scfg = container_of(task, struct server, task); - if (task->dead) { - debug(DBG_CFG, "task dead\n"); - return; - } + assert_task_alive(DBG_CFG, task); if (res < 0) { error("open(%s) failed: %s\n", scfg->name, strerror(-res)); @@ -464,10 +460,7 @@ inotify_cb(struct cfg *cfg, struct uring_task *task, int res) char *ptr; struct server *scfg; - if (task->dead) { - debug(DBG_CFG, "task is dead\n"); - return; - } + assert_task_alive(DBG_CFG, task); if (res <= 0) perrordie("inotify_read (%i)", res); -- cgit v1.2.3