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

MEDIUM: fd: make thread_mask now represent group-local IDs

Browse Source 
With the change that was started on other masks, the thread mask was
still not fully converted, sometimes being used as a global mask and
sometimes as a local one. This finishes the code modifications so that
the mask is always considered as a group-local mask. This doesn't
change anything as long as there's a single group, but is necessary
for groups 2 and above since it's used against running_mask and so on.
This commit is contained in:
Willy Tarreau 2022-07-07 08:23:03 +02:00
parent d6e1987612
commit 3638d174e5
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/fd.h
View File

@ -431,7 +431,7 @@ static inline void fd_insert(int fd, void *owner, void (*iocb)(int fd), int tgid
BUG_ON(fdtab[fd].state != 0); BUG_ON(fdtab[fd].state != 0);
BUG_ON(fdtab[fd].refc_tgid != 0); BUG_ON(fdtab[fd].refc_tgid != 0);
thread_mask &= all_threads_mask; thread_mask &= tg->threads_enabled;
BUG_ON(thread_mask == 0); BUG_ON(thread_mask == 0);
fdtab[fd].owner = owner; fdtab[fd].owner = owner;

4
src/ev_epoll.c
View File

@ -99,7 +99,7 @@ static void _update_fd(int fd)
en |= FD_EV_ACTIVE_R; en |= FD_EV_ACTIVE_R;
if ((ps | pr) & ti->ltid_bit) { if ((ps | pr) & ti->ltid_bit) {
if (!(fdtab[fd].thread_mask & tid_bit) || !(en & FD_EV_ACTIVE_RW)) { if (!(fdtab[fd].thread_mask & ti->ltid_bit) || !(en & FD_EV_ACTIVE_RW)) {
/* fd removed from poll list */ /* fd removed from poll list */
opcode = EPOLL_CTL_DEL; opcode = EPOLL_CTL_DEL;
if (pr & ti->ltid_bit) if (pr & ti->ltid_bit)
@ -129,7 +129,7 @@ static void _update_fd(int fd)
opcode = EPOLL_CTL_MOD; opcode = EPOLL_CTL_MOD;
} }
} }
else if ((fdtab[fd].thread_mask & tid_bit) && (en & FD_EV_ACTIVE_RW)) { else if ((fdtab[fd].thread_mask & ti->ltid_bit) && (en & FD_EV_ACTIVE_RW)) {
/* new fd in the poll list */ /* new fd in the poll list */
opcode = EPOLL_CTL_ADD; opcode = EPOLL_CTL_ADD;
if (en & FD_EV_ACTIVE_R) if (en & FD_EV_ACTIVE_R)

2
src/ev_evports.c
View File

@ -71,7 +71,7 @@ static void _update_fd(int fd)
pr = _HA_ATOMIC_LOAD(&polled_mask[fd].poll_recv); pr = _HA_ATOMIC_LOAD(&polled_mask[fd].poll_recv);
ps = _HA_ATOMIC_LOAD(&polled_mask[fd].poll_send); ps = _HA_ATOMIC_LOAD(&polled_mask[fd].poll_send);
if (!(fdtab[fd].thread_mask & tid_bit) || !(en & FD_EV_ACTIVE_RW)) { if (!(fdtab[fd].thread_mask & ti->ltid_bit) || !(en & FD_EV_ACTIVE_RW)) {
if (!((pr | ps) & ti->ltid_bit)) { if (!((pr | ps) & ti->ltid_bit)) {
/* fd was not watched, it's still not */ /* fd was not watched, it's still not */
return; return;

2
src/ev_kqueue.c
View File

@ -42,7 +42,7 @@ static int _update_fd(int fd, int start)
pr = _HA_ATOMIC_LOAD(&polled_mask[fd].poll_recv); pr = _HA_ATOMIC_LOAD(&polled_mask[fd].poll_recv);
ps = _HA_ATOMIC_LOAD(&polled_mask[fd].poll_send); ps = _HA_ATOMIC_LOAD(&polled_mask[fd].poll_send);
if (!(fdtab[fd].thread_mask & tid_bit) || !(en & FD_EV_ACTIVE_RW)) { if (!(fdtab[fd].thread_mask & ti->ltid_bit) || !(en & FD_EV_ACTIVE_RW)) {
if (!((pr | ps) & ti->ltid_bit)) { if (!((pr | ps) & ti->ltid_bit)) {
/* fd was not watched, it's still not */ /* fd was not watched, it's still not */
return changes; return changes;

2
src/ev_poll.c
View File

@ -192,7 +192,7 @@ static void _do_poll(struct poller *p, int exp, int wake)
continue; continue;
} }
if (!(fdtab[fd].thread_mask & tid_bit)) { if (!(fdtab[fd].thread_mask & ti->ltid_bit)) {
continue; continue;
} }

13
src/fd.c
View File

@ -440,7 +440,7 @@ int fd_takeover(int fd, void *expected_owner)
} }
/* success, from now on it's ours */ /* success, from now on it's ours */
HA_ATOMIC_STORE(&fdtab[fd].thread_mask, tid_bit); HA_ATOMIC_STORE(&fdtab[fd].thread_mask, ti->ltid_bit);
/* Make sure the FD doesn't have the active bit. It is possible that /* Make sure the FD doesn't have the active bit. It is possible that
* the fd is polled by the thread that used to own it, the new thread * the fd is polled by the thread that used to own it, the new thread
@ -458,7 +458,7 @@ int fd_takeover(int fd, void *expected_owner)
void updt_fd_polling(const int fd) void updt_fd_polling(const int fd)
{ {
if (all_threads_mask == 1UL || (fdtab[fd].thread_mask & all_threads_mask) == tid_bit) { if (tg->threads_enabled == 1UL || (fdtab[fd].thread_mask & tg->threads_enabled) == ti->ltid_bit) {
if (HA_ATOMIC_BTS(&fdtab[fd].update_mask, ti->ltid)) if (HA_ATOMIC_BTS(&fdtab[fd].update_mask, ti->ltid))
return; return;
@ -472,12 +472,13 @@ void updt_fd_polling(const int fd)
fd_add_to_fd_list(&update_list[tgid - 1], fd); fd_add_to_fd_list(&update_list[tgid - 1], fd);
if (fd_active(fd) && !(fdtab[fd].thread_mask & tid_bit)) { if (fd_active(fd) && !(fdtab[fd].thread_mask & ti->ltid_bit)) {
/* we need to wake up another thread to handle it immediately, any will fit, /* we need to wake up another thread to handle it immediately, any will fit,
* so let's pick a random one so that it doesn't always end up on the same. * so let's pick a random one so that it doesn't always end up on the same.
*/ */
int thr = one_among_mask(fdtab[fd].thread_mask & all_threads_mask, int thr = one_among_mask(fdtab[fd].thread_mask & tg->threads_enabled,
statistical_prng_range(MAX_THREADS)); statistical_prng_range(MAX_THREADS));
thr += ha_tgroup_info[tgid - 1].base;
wake_thread(thr); wake_thread(thr);
} }
} }
@ -520,7 +521,7 @@ int fd_update_events(int fd, uint evts)
tmask = _HA_ATOMIC_LOAD(&fdtab[fd].thread_mask); tmask = _HA_ATOMIC_LOAD(&fdtab[fd].thread_mask);
} while (rmask & ~tmask); } while (rmask & ~tmask);
if (!(tmask & tid_bit)) { if (!(tmask & ti->ltid_bit)) {
/* a takeover has started */ /* a takeover has started */
activity[tid].poll_skip_fd++; activity[tid].poll_skip_fd++;
@ -536,7 +537,7 @@ int fd_update_events(int fd, uint evts)
/* with running we're safe now, we can drop the reference */ /* with running we're safe now, we can drop the reference */
fd_drop_tgid(fd); fd_drop_tgid(fd);
locked = (tmask != tid_bit); locked = (tmask != ti->ltid_bit);
/* OK now we are guaranteed that our thread_mask was present and /* OK now we are guaranteed that our thread_mask was present and
* that we're allowed to update the FD. * that we're allowed to update the FD.