RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-04 15:19:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

MAJOR: task: use t->tid instead of ffsl(t->thread_mask) to take the thread ID

Browse Source 
At several places we need to figure the ID of the first thread allowed
to run a task. Till now this was performed using my_ffsl(t->thread_mask)
but since we now have the thread ID stored into the task, let's use it
instead. This is tagged major because it starts to assume that tid<0 is
strictly equivalent to atleast2(thread_mask), and that as such, among
the allowed threads are the current one.
This commit is contained in:
Willy Tarreau 2022-06-15 14:31:38 +02:00
parent 5b8e054732
commit 29ffe26733
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/haproxy/task.h
View File

@ -438,9 +438,12 @@ static inline void _tasklet_wakeup_on(struct tasklet *tl, int thr, const char *f
static inline void _task_instant_wakeup(struct task *t, unsigned int f, const char *file, int line) static inline void _task_instant_wakeup(struct task *t, unsigned int f, const char *file, int line)
{ {
struct tasklet *tl = (struct tasklet *)t; struct tasklet *tl = (struct tasklet *)t;
int thr = my_ffsl(t->thread_mask) - 1; int thr = t->tid;
unsigned int state; unsigned int state;
if (thr < 0)
thr = tid;
/* first, let's update the task's state with the wakeup condition */ /* first, let's update the task's state with the wakeup condition */
state = _HA_ATOMIC_OR_FETCH(&tl->state, f); state = _HA_ATOMIC_OR_FETCH(&tl->state, f);

2
src/peers.c
View File

@ -1040,7 +1040,7 @@ void __peer_session_deinit(struct peer *peer)
if (!peers || !peer->appctx) if (!peers || !peer->appctx)
return; return;
thr = my_ffsl(peer->appctx->t->thread_mask) - 1; thr = peer->appctx->t->tid;
HA_ATOMIC_DEC(&peers->applet_count[thr]); HA_ATOMIC_DEC(&peers->applet_count[thr]);
if (peer->appctx->st0 == PEER_SESS_ST_WAITMSG) if (peer->appctx->st0 == PEER_SESS_ST_WAITMSG)

10
src/task.c
View File

@ -85,7 +85,7 @@ void task_kill(struct task *t)
* Note: that's a task so it must be accounted for as such. Pick * Note: that's a task so it must be accounted for as such. Pick
* the task's first thread for the job. * the task's first thread for the job.
*/ */
thr = my_ffsl(t->thread_mask) - 1; thr = t->tid >= 0 ? t->tid : tid;
/* Beware: tasks that have never run don't have their ->list empty yet! */ /* Beware: tasks that have never run don't have their ->list empty yet! */
MT_LIST_APPEND(&ha_thread_ctx[thr].shared_tasklet_list, MT_LIST_APPEND(&ha_thread_ctx[thr].shared_tasklet_list,
@ -230,9 +230,10 @@ struct list *__tasklet_wakeup_after(struct list *head, struct tasklet *tl)
void __task_wakeup(struct task *t) void __task_wakeup(struct task *t)
{ {
struct eb_root *root = &th_ctx->rqueue; struct eb_root *root = &th_ctx->rqueue;
int thr __maybe_unused = t->tid >= 0 ? t->tid : tid;
#ifdef USE_THREAD #ifdef USE_THREAD
if (t->thread_mask != tid_bit && global.nbthread != 1) { if (thr != tid) {
root = &rqueue; root = &rqueue;
_HA_ATOMIC_INC(&grq_total); _HA_ATOMIC_INC(&grq_total);
@ -262,7 +263,7 @@ void __task_wakeup(struct task *t)
eb32sc_insert(root, &t->rq, t->thread_mask); eb32sc_insert(root, &t->rq, t->thread_mask);
#ifdef USE_THREAD #ifdef USE_THREAD
if (root == &rqueue) { if (thr != tid) {
_HA_ATOMIC_OR(&t->state, TASK_GLOBAL); _HA_ATOMIC_OR(&t->state, TASK_GLOBAL);
HA_SPIN_UNLOCK(TASK_RQ_LOCK, &rq_lock); HA_SPIN_UNLOCK(TASK_RQ_LOCK, &rq_lock);
@ -273,9 +274,8 @@ void __task_wakeup(struct task *t)
(t->thread_mask & all_threads_mask))) { (t->thread_mask & all_threads_mask))) {
unsigned long m = (t->thread_mask & all_threads_mask) &~ tid_bit; unsigned long m = (t->thread_mask & all_threads_mask) &~ tid_bit;
m = (m & (m - 1)) ^ m; // keep lowest bit set
_HA_ATOMIC_AND(&sleeping_thread_mask, ~m); _HA_ATOMIC_AND(&sleeping_thread_mask, ~m);
wake_thread(my_ffsl(m) - 1); wake_thread(thr);
} }
} }
#endif #endif