1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLEANUP: tasks: use the local state, not t->state, to check for tasklets

Browse Source 
There's no point reading t->state to check for a tasklet after we've
atomically read the state into the local "state" variable. Not only it's
more expensive, it's also less clear whether that state is supposed to
be atomic or not. And in any case, tasks and tasklets have their type
forever and the one reflected in state is correct and stable.
This commit is contained in:
Willy Tarreau 2025-05-02 10:55:43 +02:00
parent 45e83e8e81
commit 1ed238101a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/task.c
View File

@ -616,7 +616,7 @@ unsigned int run_tasks_from_lists(unsigned int budgets[])
__ha_barrier_atomic_store();
/* keep the task counter up to date */
if (!(t->state & TASK_F_TASKLET))
if (!(state & TASK_F_TASKLET))
_HA_ATOMIC_DEC(&ha_thread_ctx[tid].tasks_in_list);
/* From this point, we know that the task or tasklet was properly
@ -628,7 +628,7 @@ unsigned int run_tasks_from_lists(unsigned int budgets[])
if (unlikely((state & TASK_KILLED) || process == NULL)) {
/* Task or tasklet has been killed, let's remove it */
if (t->state & TASK_F_TASKLET)
if (state & TASK_F_TASKLET)
pool_free(pool_head_tasklet, t);
else {
task_unlink_wq(t);
@ -642,7 +642,7 @@ unsigned int run_tasks_from_lists(unsigned int budgets[])
}
/* OK now the task or tasklet is well alive and is going to be run */
if (t->state & TASK_F_TASKLET) {
if (state & TASK_F_TASKLET) {
/* this is a tasklet */
t = process(t, ctx, state);