RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-01 23:39:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

MAJOR: task: replace t->thread_mask with 1<<t->tid when thread mask is needed

Browse Source 
At a few places where the task's thread mask. Now we know that it's always
either one bit or all bits of all_threads_mask, so we can replace it with
either 1<<tid or all_threads_mask depending on what's expected.

It's worth noting that the global_tasks_mask is still set this way and
that it's reaching its limits. Similarly, the task_new() API would deserve
an update to stop using a thread mask and use a thread number instead.
Similarly, task_set_affinity() should be updated to directly take a
thread number.

At this point the task's thread mask is not used anymore.
This commit is contained in:
Willy Tarreau 2022-06-15 15:44:00 +02:00
parent 29ffe26733
commit c44d08ebc4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/task.c
View File

@ -239,7 +239,10 @@ void __task_wakeup(struct task *t)
_HA_ATOMIC_INC(&grq_total); _HA_ATOMIC_INC(&grq_total);
HA_SPIN_LOCK(TASK_RQ_LOCK, &rq_lock); HA_SPIN_LOCK(TASK_RQ_LOCK, &rq_lock);
global_tasks_mask |= t->thread_mask; if (t->tid < 0)
global_tasks_mask = all_threads_mask;
else
global_tasks_mask |= 1UL << thr;
t->rq.key = ++global_rqueue_ticks; t->rq.key = ++global_rqueue_ticks;
__ha_barrier_store(); __ha_barrier_store();
} else } else
@ -260,7 +263,7 @@ void __task_wakeup(struct task *t)
if (th_ctx->flags & TH_FL_TASK_PROFILING) if (th_ctx->flags & TH_FL_TASK_PROFILING)
t->call_date = now_mono_time(); t->call_date = now_mono_time();
eb32sc_insert(root, &t->rq, t->thread_mask); eb32sc_insert(root, &t->rq, 1UL << thr);
#ifdef USE_THREAD #ifdef USE_THREAD
if (thr != tid) { if (thr != tid) {
@ -270,9 +273,8 @@ void __task_wakeup(struct task *t)
/* If all threads that are supposed to handle this task are sleeping, /* If all threads that are supposed to handle this task are sleeping,
* wake one. * wake one.
*/ */
if ((((t->thread_mask & all_threads_mask) & sleeping_thread_mask) == if (sleeping_thread_mask & (1UL << thr)) {
(t->thread_mask & all_threads_mask))) { unsigned long m = 1UL << thr;
unsigned long m = (t->thread_mask & all_threads_mask) &~ tid_bit;
_HA_ATOMIC_AND(&sleeping_thread_mask, ~m); _HA_ATOMIC_AND(&sleeping_thread_mask, ~m);
wake_thread(thr); wake_thread(thr);