From fa070d90074629cb8262bc4e2a6ceef57a9fbd5c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 25 Apr 2018 20:25:21 +0200 Subject: [PATCH] pthreadpool: make use of pthreadpool_stop() in pthreadpool_tevent_destructor() Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme --- lib/pthreadpool/pthreadpool_tevent.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/pthreadpool/pthreadpool_tevent.c b/lib/pthreadpool/pthreadpool_tevent.c index bfd178c09a6..e7396537058 100644 --- a/lib/pthreadpool/pthreadpool_tevent.c +++ b/lib/pthreadpool/pthreadpool_tevent.c @@ -135,11 +135,10 @@ static int pthreadpool_tevent_destructor(struct pthreadpool_tevent *pool) struct pthreadpool_tevent_glue *glue = NULL; int ret; - ret = pthreadpool_destroy(pool->pool); + ret = pthreadpool_stop(pool->pool); if (ret != 0) { return ret; } - pool->pool = NULL; for (job = pool->jobs; job != NULL; job = njob) { njob = job->next; @@ -159,6 +158,12 @@ static int pthreadpool_tevent_destructor(struct pthreadpool_tevent *pool) } pool->glue_list = NULL; + ret = pthreadpool_destroy(pool->pool); + if (ret != 0) { + return ret; + } + pool->pool = NULL; + return 0; } -- 2.34.1