Merge pull request #483 from MrAnno/fix-birth-timeout-deadlock

core: fix deadlock in overloaded scenarios
Snaipe · Mar 27, 2023 · e87f6ae · e87f6ae
2 parents 4fd5418 + d70cc5d
commit e87f6ae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/core/client.c b/src/core/client.c
@@ -263,7 +263,7 @@ bool handle_birth(struct server_ctx *sctx, struct client_ctx *ctx, const criteri
     (void) sctx;
     (void) msg;
 
-    ctx->alive = true;
+    ctx->dead = false;
     return false;
 }
 
@@ -452,7 +452,7 @@ bool handle_death(struct server_ctx *sctx, struct client_ctx *ctx, const criteri
 {
     (void) sctx;
 
-    ctx->alive = false;
+    ctx->dead = true;
 
     const criterion_protocol_death *death = &msg->data.value.death;
     enum client_state curstate = ctx->state & (CS_MAX_CLIENT_STATES - 1);

diff --git a/src/core/client.h b/src/core/client.h
@@ -56,7 +56,7 @@ struct client_ctx {
     struct criterion_test extern_test;
 
     uint32_t state;
-    bool alive;
+    bool dead;
     struct criterion_global_stats *gstats;
     struct criterion_suite_stats *sstats;
     struct criterion_test_stats *tstats;

diff --git a/src/core/runner.c b/src/core/runner.c
@@ -297,7 +297,7 @@ static void run_tests_async(struct criterion_test_set *set,
         if (!cctx)
             continue;
 
-        if (!cctx->alive) {
+        if (cctx->dead) {
             if ((cctx->tstats->test_status == CR_STATUS_FAILED) && criterion_options.fail_fast)
                 cr_terminate(cctx->gstats);