mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-08 08:07:10 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: task: remove tasklet_insert_into_tasklet_list()

Browse Source 
This function is only called at a single place and adds more confusion
than it removes. It also makes one think it could be used outside of
the scheduler while it must absolutely not. Let's just move its two
lines to the call place, making the code more readable there. In
addition this clearly shows that the preliminary LIST_INIT() is
useless since the entry is immediately overwritten.
This commit is contained in:
Willy Tarreau 2020-11-30 15:30:22 +01:00
parent 1f05324cbe
commit a868c2920b
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/haproxy/task.h
View File

@ -369,15 +369,6 @@ static inline void tasklet_wakeup(struct tasklet *tl)
tasklet_wakeup_on(tl, tl->tid); tasklet_wakeup_on(tl, tl->tid);
} }
/* Insert a tasklet into the tasklet list. If used with a plain task instead,
* the caller must update the task_list_size.
*/
static inline void tasklet_insert_into_tasklet_list(struct list *list, struct tasklet *tl)
{
_HA_ATOMIC_ADD(&tasks_run_queue, 1);
LIST_ADDQ(list, &tl->list);
}
/* Remove the tasklet from the tasklet list. The tasklet MUST already be there. /* 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 * If unsure, use tasklet_remove_from_tasklet_list() instead. If used with a
* plain task, the caller must update the task_list_size. * plain task, the caller must update the task_list_size.

7
src/task.c
View File

@ -660,10 +660,9 @@ void process_runnable_tasks()
} }
#endif #endif
/* Make sure the entry doesn't appear to be in a list */ /* Add it to the local task list */
LIST_INIT(&((struct tasklet *)t)->list); LIST_ADDQ(&tt->tasklets[TL_NORMAL], &((struct tasklet *)t)->list);
/* And add it to the local task list */ _HA_ATOMIC_ADD(&tasks_run_queue, 1);
tasklet_insert_into_tasklet_list(&tt->tasklets[TL_NORMAL], (struct tasklet *)t);
tt->tl_class_mask |= 1 << TL_NORMAL; tt->tl_class_mask |= 1 << TL_NORMAL;
_HA_ATOMIC_ADD(&tt->task_list_size, 1); _HA_ATOMIC_ADD(&tt->task_list_size, 1);
activity[tid].tasksw++; activity[tid].tasksw++;