From bc49b806c113286d1d7fbec7d0ae2c395459f3b2 Mon Sep 17 00:00:00 2001 From: Ryan Fleury Date: Fri, 7 Nov 2025 10:33:17 -0800 Subject: [PATCH] do not retry artifact computation if cancelled --- src/artifact_cache/artifact_cache.c | 4 ++-- src/text/text.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/artifact_cache/artifact_cache.c b/src/artifact_cache/artifact_cache.c index 679a50fe..6e2d138d 100644 --- a/src/artifact_cache/artifact_cache.c +++ b/src/artifact_cache/artifact_cache.c @@ -376,7 +376,7 @@ ac_async_tick(void) AC_Artifact val = r->create(r->key, r->cancel_signal, &retry, &gen); // rjf: retry? -> resubmit request - if(retry && lane_idx() == 0) + if(retry && lane_idx() == 0 && !ins_atomic_u32_eval(r->cancel_signal)) { AC_RequestBatch *batch = &ac_shared->req_batches[task_idx]; MutexScope(batch->mutex) @@ -485,7 +485,7 @@ ac_async_tick(void) lane_ctx(lane_ctx_restore); // rjf: retry? -> resubmit request - if(retry) + if(retry && !ins_atomic_u32_eval(r->cancel_signal)) { AC_RequestBatch *batch = &ac_shared->req_batches[task_idx]; MutexScope(batch->mutex) diff --git a/src/text/text.c b/src/text/text.c index 8da83931..d8bac644 100644 --- a/src/text/text.c +++ b/src/text/text.c @@ -307,8 +307,8 @@ txt_token_array_from_lang_kind_string(Arena *arena, TXT_LangKind lang_kind, Stri ender_found = 1; } else if(active_rule != nil_rule && - str8_match(string_1byte, active_rule->close_string, 0) || - str8_match(string_2byte, active_rule->close_string, 0)) + (str8_match(string_1byte, active_rule->close_string, 0) || + str8_match(string_2byte, active_rule->close_string, 0))) { ender_found = 1; ender_pad = active_rule->close_advance;