mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: tasks: use a less confusing name for task_list_size

Browse Source 
This one is systematically misunderstood due to its unclear name. It
is in fact the number of tasks in the local tasklet list. Let's call
it "tasks_in_list" to remove some of the confusion.
This commit is contained in:
Willy Tarreau 2021-02-24 14:13:40 +01:00
parent 2c41d77ebc
commit 1f3b1417b8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/task-t.h
View File

@ -77,7 +77,7 @@ struct task_per_thread {
struct mt_list shared_tasklet_list; /* Tasklet to be run, woken up by other threads */ struct mt_list shared_tasklet_list; /* Tasklet to be run, woken up by other threads */
struct list tasklets[TL_CLASSES]; /* tasklets (and/or tasks) to run, by class */ struct list tasklets[TL_CLASSES]; /* tasklets (and/or tasks) to run, by class */
unsigned int rqueue_ticks; /* Insertion counter for the run queue */ unsigned int rqueue_ticks; /* Insertion counter for the run queue */
int task_list_size; /* Number of tasks among the tasklets */ int tasks_in_list; /* Number of tasks in the per-thread tasklets list */
int current_queue; /* points to current tasklet list being run, -1 if none */ int current_queue; /* points to current tasklet list being run, -1 if none */
unsigned int rq_total; /* total size of the run queue, prio_tree + tasklets */ unsigned int rq_total; /* total size of the run queue, prio_tree + tasklets */
struct task *current; /* current task (not tasklet) */ struct task *current; /* current task (not tasklet) */

2
src/debug.c
View File

@ -174,7 +174,7 @@ void ha_thread_dump(struct buffer *buf, int thr, int calling_tid)
LIST_ISEMPTY(&task_per_thread[thr].tasklets[TL_NORMAL]) && LIST_ISEMPTY(&task_per_thread[thr].tasklets[TL_NORMAL]) &&
LIST_ISEMPTY(&task_per_thread[thr].tasklets[TL_BULK]) && LIST_ISEMPTY(&task_per_thread[thr].tasklets[TL_BULK]) &&
MT_LIST_ISEMPTY(&task_per_thread[thr].shared_tasklet_list)), MT_LIST_ISEMPTY(&task_per_thread[thr].shared_tasklet_list)),
task_per_thread[thr].task_list_size, task_per_thread[thr].tasks_in_list,
task_per_thread[thr].rq_total, task_per_thread[thr].rq_total,
stuck, stuck,
!!(task_profiling_mask & thr_bit)); !!(task_profiling_mask & thr_bit));

8
src/task.c
View File

@ -97,7 +97,7 @@ void task_kill(struct task *t)
MT_LIST_ADDQ(&task_per_thread[thr].shared_tasklet_list, MT_LIST_ADDQ(&task_per_thread[thr].shared_tasklet_list,
(struct mt_list *)&((struct tasklet *)t)->list); (struct mt_list *)&((struct tasklet *)t)->list);
_HA_ATOMIC_ADD(&task_per_thread[thr].rq_total, 1); _HA_ATOMIC_ADD(&task_per_thread[thr].rq_total, 1);
_HA_ATOMIC_ADD(&task_per_thread[thr].task_list_size, 1); _HA_ATOMIC_ADD(&task_per_thread[thr].tasks_in_list, 1);
if (sleeping_thread_mask & (1UL << thr)) { if (sleeping_thread_mask & (1UL << thr)) {
_HA_ATOMIC_AND(&sleeping_thread_mask, ~(1UL << thr)); _HA_ATOMIC_AND(&sleeping_thread_mask, ~(1UL << thr));
wake_thread(thr); wake_thread(thr);
@ -485,7 +485,7 @@ unsigned int run_tasks_from_lists(unsigned int budgets[])
/* OK then this is a regular task */ /* OK then this is a regular task */
_HA_ATOMIC_SUB(&task_per_thread[tid].task_list_size, 1); _HA_ATOMIC_SUB(&task_per_thread[tid].tasks_in_list, 1);
if (unlikely(t->call_date)) { if (unlikely(t->call_date)) {
uint64_t now_ns = now_mono_time(); uint64_t now_ns = now_mono_time();
uint64_t lat = now_ns - t->call_date; uint64_t lat = now_ns - t->call_date;
@ -631,7 +631,7 @@ void process_runnable_tasks()
/* pick up to max[TL_NORMAL] regular tasks from prio-ordered run queues */ /* pick up to max[TL_NORMAL] regular tasks from prio-ordered run queues */
/* Note: the grq lock is always held when grq is not null */ /* Note: the grq lock is always held when grq is not null */
picked = 0; picked = 0;
budget = max[TL_NORMAL] - tt->task_list_size; budget = max[TL_NORMAL] - tt->tasks_in_list;
while (picked < budget) { while (picked < budget) {
if ((global_tasks_mask & tid_bit) && !grq) { if ((global_tasks_mask & tid_bit) && !grq) {
#ifdef USE_THREAD #ifdef USE_THREAD
@ -693,7 +693,7 @@ void process_runnable_tasks()
if (picked) { if (picked) {
tt->tl_class_mask |= 1 << TL_NORMAL; tt->tl_class_mask |= 1 << TL_NORMAL;
_HA_ATOMIC_ADD(&tt->task_list_size, picked); _HA_ATOMIC_ADD(&tt->tasks_in_list, picked);
_HA_ATOMIC_ADD(&tt->rq_total, picked); _HA_ATOMIC_ADD(&tt->rq_total, picked);
activity[tid].tasksw += picked; activity[tid].tasksw += picked;
} }