do not retry artifact computation if cancelled

This commit is contained in:
Ryan Fleury
2025-11-07 10:33:17 -08:00
parent e9e0036122
commit bc49b806c1
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -376,7 +376,7 @@ ac_async_tick(void)
AC_Artifact val = r->create(r->key, r->cancel_signal, &retry, &gen); AC_Artifact val = r->create(r->key, r->cancel_signal, &retry, &gen);
// rjf: retry? -> resubmit request // 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]; AC_RequestBatch *batch = &ac_shared->req_batches[task_idx];
MutexScope(batch->mutex) MutexScope(batch->mutex)
@@ -485,7 +485,7 @@ ac_async_tick(void)
lane_ctx(lane_ctx_restore); lane_ctx(lane_ctx_restore);
// rjf: retry? -> resubmit request // rjf: retry? -> resubmit request
if(retry) if(retry && !ins_atomic_u32_eval(r->cancel_signal))
{ {
AC_RequestBatch *batch = &ac_shared->req_batches[task_idx]; AC_RequestBatch *batch = &ac_shared->req_batches[task_idx];
MutexScope(batch->mutex) MutexScope(batch->mutex)
+2 -2
View File
@@ -307,8 +307,8 @@ txt_token_array_from_lang_kind_string(Arena *arena, TXT_LangKind lang_kind, Stri
ender_found = 1; ender_found = 1;
} }
else if(active_rule != nil_rule && else if(active_rule != nil_rule &&
str8_match(string_1byte, active_rule->close_string, 0) || (str8_match(string_1byte, active_rule->close_string, 0) ||
str8_match(string_2byte, active_rule->close_string, 0)) str8_match(string_2byte, active_rule->close_string, 0)))
{ {
ender_found = 1; ender_found = 1;
ender_pad = active_rule->close_advance; ender_pad = active_rule->close_advance;