diff options
| -rw-r--r-- | src/util/thread.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/util/thread.c b/src/util/thread.c index 0bf45ec..f6201f1 100644 --- a/src/util/thread.c +++ b/src/util/thread.c @@ -28,11 +28,14 @@ static void __thread_loop_main(void *_ctx) struct thread_context *ctx = _ctx; void *result; + mtx_lock(&ctx->lock); while (ctx->state != THREAD_STATE_TERMINATED) { - if (ctx->timer.tv_sec || ctx->timer.tv_nsec) + if (ctx->timer.tv_sec || ctx->timer.tv_nsec) { + mtx_unlock(&ctx->lock); thrd_sleep(&ctx->timer, NULL); + mtx_lock(&ctx->lock); + } - mtx_lock(&ctx->lock); while (ctx->state == THREAD_STATE_STOPPED) cnd_wait(&ctx->wait, &ctx->lock); if (ctx->state == THREAD_STATE_TERMINATED) @@ -46,8 +49,8 @@ static void __thread_loop_main(void *_ctx) ctx->state = THREAD_STATE_TERMINATED; ctx->result = result; } - mtx_unlock(&ctx->lock); } + mtx_unlock(&ctx->lock); thrd_exit(ret); } @@ -106,6 +109,7 @@ static int do_create_thread(struct thread **thread, ctx->func = func; ctx->arg = arg; + mtx_lock(&ctx->lock); switch (type) { case THREAD_TYPE_WORKER: ctx->state = THREAD_STATE_STOPPED; @@ -135,10 +139,12 @@ static int do_create_thread(struct thread **thread, new_thread->ctx = ctx; *thread = new_thread; + mtx_unlock(&ctx->lock); return 0; err: + mtx_unlock(&ctx->lock); cnd_destroy(&ctx->wait); mtx_destroy(&ctx->lock); free(ctx); |