RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-06 19:38:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: task: remove __tasklet_remove_from_tasklet_list()

Browse Source 
This function is only used at a single place directly within the
scheduler in run_tasks_from_lists() and it really ought not be called
by anything else, regardless of what its comment says. Let's delete
it, move the two lines directly into the call place, and take this
opportunity to factor the atomic decrement on tasks_run_queue. A comment
was added on the remaining one tasklet_remove_from_tasklet_list() to
mention the risks in using it.
This commit is contained in:
Willy Tarreau 2020-11-30 14:52:11 +01:00
parent c309dbdd99
commit 2da4c316c2
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/haproxy/task.h
View File

@ -369,18 +369,9 @@ static inline void tasklet_wakeup(struct tasklet *tl)
tasklet_wakeup_on(tl, tl->tid);
}
/* Remove the tasklet from the tasklet list. The tasklet MUST already be there.
* If unsure, use tasklet_remove_from_tasklet_list() instead. If used with a
* plain task, the caller must update the task_list_size.
* This should only be used by the thread that owns the tasklet, any other
* thread should use tasklet_cancel().
/* Try to remove a tasklet from the list. This call is inherently racy and may
* only be performed on the thread that was supposed to dequeue this tasklet.
*/
static inline void __tasklet_remove_from_tasklet_list(struct tasklet *t)
{
LIST_DEL_INIT(&t->list);
_HA_ATOMIC_SUB(&tasks_run_queue, 1);
}
static inline void tasklet_remove_from_tasklet_list(struct tasklet *t)
{
if (MT_LIST_DEL((struct mt_list *)&t->list))

6
src/task.c
View File

@ -458,10 +458,12 @@ unsigned int run_tasks_from_lists(unsigned int budgets[])
t->calls++;
sched->current = t;
_HA_ATOMIC_SUB(&tasks_run_queue, 1);
if (TASK_IS_TASKLET(t)) {
state = _HA_ATOMIC_XCHG(&t->state, state);
__ha_barrier_atomic_store();
__tasklet_remove_from_tasklet_list((struct tasklet *)t);
LIST_DEL_INIT(&((struct tasklet *)t)->list);
process(t, ctx, state);
done++;
sched->current = NULL;
@ -471,7 +473,7 @@ unsigned int run_tasks_from_lists(unsigned int budgets[])
state = _HA_ATOMIC_XCHG(&t->state, state | TASK_RUNNING);
__ha_barrier_atomic_store();
__tasklet_remove_from_tasklet_list((struct tasklet *)t);
LIST_DEL_INIT(&((struct tasklet *)t)->list);
/* OK then this is a regular task */