RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-05-16 22:58:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: tinfo: remove the global thread ID bit (tid_bit)

Browse Source 
Each thread has its own local thread id and its own global thread id,
in addition to the masks corresponding to each. Once the global thread
ID can go beyond 64 it will not be possible to have a global thread Id
bit anymore, so better start to remove it and use only the local one
from the struct thread_info.
This commit is contained in:
Willy Tarreau 2022-06-14 10:43:01 +02:00
parent 8716875ea4
commit 1a85a958dd
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/haproxy/thread.h
View File

@ -223,14 +223,14 @@ extern THREAD_LOCAL unsigned int tgid; /* The thread group id (starts at 1)
static inline void ha_set_thread(const struct thread_info *thr)
{
if (thr) {
BUG_ON(!thr->tid_bit);
BUG_ON(!thr->ltid_bit);
BUG_ON(!thr->tg);
BUG_ON(!thr->tg->tgid);
ti = thr;
tg = thr->tg;
tid = thr->tid;
tid_bit = thr->tid_bit;
tid_bit = thr->ltid_bit;
th_ctx = &ha_thread_ctx[tid];
tgid = tg->tgid;
} else {

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

@ -62,7 +62,7 @@ struct tgroup_info {
struct thread_info {
const struct tgroup_info *tg; /* config of the thread-group this thread belongs to */
uint tid, ltid; /* process-wide and group-wide thread ID (start at 0) */
ulong tid_bit, ltid_bit; /* bit masks for the tid/ltid */
ulong ltid_bit; /* bit masks for the tid/ltid */
/* pad to cache line (64B) */
char __pad[0]; /* unused except to check remaining room */

2
src/thread.c
View File

@ -1078,8 +1078,6 @@ int thread_map_to_groups()
for (t = 0; t < global.nbthread; t++) {
ha_thread_info[t].tid = t;
ha_thread_info[t].ltid = t - ha_thread_info[t].tg->base;
ha_thread_info[t].tid_bit = 1UL << ha_thread_info[t].tid;
ha_thread_info[t].ltid_bit = 1UL << ha_thread_info[t].ltid;
}