fy59/lardon3d
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(task): harden reservation handling in sequence break

Browse source
This commit is contained in:
fy59 2026-08-07 11:01:47 +02:00
parent fb70420370
commit d1292bf58e
1 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/task.c
View file

@ -323,8 +323,13 @@ lardon3d_task_sequence_break(
(void)pthread_cond_wait(&task->condition, &task->mutex); (void)pthread_cond_wait(&task->condition, &task->mutex);
} }
if (task->cancel_requested) { if (task->cancel_requested) {
Lardon3DResourceReservation *res = task->current_reservation;
task->current_reservation = NULL;
finish_locked(task, TASK_CANCELLED, "Tâche annulée."); finish_locked(task, TASK_CANCELLED, "Tâche annulée.");
(void)pthread_mutex_unlock(&task->mutex); (void)pthread_mutex_unlock(&task->mutex);
if (res) {
(void)lardon3d_resource_governor_release(governor, res);
}
return false; return false;
} }
task->state = TASK_RUNNING; task->state = TASK_RUNNING;
@ -346,8 +351,13 @@ lardon3d_task_sequence_break(
(void)pthread_cond_wait(&task->condition, &task->mutex); (void)pthread_cond_wait(&task->condition, &task->mutex);
} }
if (task->cancel_requested) { if (task->cancel_requested) {
Lardon3DResourceReservation *res = task->current_reservation;
task->current_reservation = NULL;
finish_locked(task, TASK_CANCELLED, "Tâche annulée."); finish_locked(task, TASK_CANCELLED, "Tâche annulée.");
(void)pthread_mutex_unlock(&task->mutex); (void)pthread_mutex_unlock(&task->mutex);
if (res) {
(void)lardon3d_resource_governor_release(governor, res);
}
return false; return false;
} }
task->state = TASK_RUNNING; task->state = TASK_RUNNING;
@ -364,6 +374,9 @@ lardon3d_task_sequence_break(
); );
if (!admitted) { if (!admitted) {
/* Erreur interne : échec d'allocation ou d'instantané. */ /* Erreur interne : échec d'allocation ou d'instantané. */
if (next) {
(void)lardon3d_resource_governor_release(governor, next);
}
(void)pthread_mutex_lock(&task->mutex); (void)pthread_mutex_lock(&task->mutex);
task->current_reservation = NULL; task->current_reservation = NULL;
finish_locked( finish_locked(
@ -437,7 +450,6 @@ lardon3d_task_sequence_break(
(void)pthread_mutex_unlock(&task->mutex); (void)pthread_mutex_unlock(&task->mutex);
return false; return false;
case LARDON3D_RESOURCE_WAIT: case LARDON3D_RESOURCE_WAIT:
default:
/* Indisponibilité temporaire : ne pas échouer, attendre un /* Indisponibilité temporaire : ne pas échouer, attendre un
* changement de ressources puis retenter l'admission. */ * changement de ressources puis retenter l'admission. */
if (next) { if (next) {
@ -449,6 +461,20 @@ lardon3d_task_sequence_break(
LARDON3D_SEQUENCE_ADMISSION_WAIT_NS LARDON3D_SEQUENCE_ADMISSION_WAIT_NS
); );
break; break;
default:
/* Décision inconnue : erreur interne, ne jamais boucler. */
if (next) {
(void)lardon3d_resource_governor_release(governor, next);
}
(void)pthread_mutex_lock(&task->mutex);
task->current_reservation = NULL;
finish_locked(
task,
TASK_FAILED,
"Décision de ressource inconnue."
);
(void)pthread_mutex_unlock(&task->mutex);
return false;
} }
} }
} }