MINOR: fd/thread: get rid of thread_mask()
Since commit d2494e048 ("BUG/MEDIUM: peers/config: properly set the
thread mask") there must not remain any single case of a receiver that
is bound nowhere, so there's no need anymore for thread_mask().
We're adding a test in fd_insert() to make sure this doesn't happen by
accident though, but the function was removed and its rare uses were
replaced with the original value of the bind_thread msak.
diff --git a/include/haproxy/fd.h b/include/haproxy/fd.h
index 7d67cef..2b2c3ff 100644
--- a/include/haproxy/fd.h
+++ b/include/haproxy/fd.h
@@ -334,6 +334,7 @@
BUG_ON(fd < 0 || fd >= global.maxsock);
BUG_ON(fdtab[fd].owner != NULL);
BUG_ON(fdtab[fd].state != 0);
+ BUG_ON(thread_mask == 0);
fdtab[fd].owner = owner;
fdtab[fd].iocb = iocb;
diff --git a/include/haproxy/thread.h b/include/haproxy/thread.h
index fe23127..67aefc7 100644
--- a/include/haproxy/thread.h
+++ b/include/haproxy/thread.h
@@ -469,10 +469,4 @@
#endif /* USE_THREAD */
-/* returns a mask if set, otherwise all_threads_mask */
-static inline unsigned long thread_mask(unsigned long mask)
-{
- return mask ? mask : all_threads_mask;
-}
-
#endif /* _HAPROXY_THREAD_H */
diff --git a/src/listener.c b/src/listener.c
index 6b08802..5b91faf 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -992,7 +992,7 @@
if (l->rx.flags & RX_F_LOCAL_ACCEPT)
goto local_accept;
- mask = thread_mask(l->rx.bind_thread) & all_threads_mask;
+ mask = l->rx.bind_thread & all_threads_mask;
if (atleast2(mask) && (global.tune.options & GTUNE_LISTENER_MQ) && !stopping) {
struct accept_queue_ring *ring;
unsigned int t, t0, t1, t2;
diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index 54cc34f..234ec10 100644
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -157,7 +157,7 @@
rx->flags |= RX_F_BOUND;
- fd_insert(rx->fd, rx->owner, rx->iocb, thread_mask(rx->bind_thread) & all_threads_mask);
+ fd_insert(rx->fd, rx->owner, rx->iocb, rx->bind_thread & all_threads_mask);
return err;
bind_return:
diff --git a/src/sock_inet.c b/src/sock_inet.c
index 46cc16a..bc3b762 100644
--- a/src/sock_inet.c
+++ b/src/sock_inet.c
@@ -390,7 +390,7 @@
rx->fd = fd;
rx->flags |= RX_F_BOUND;
- fd_insert(fd, rx->owner, rx->iocb, thread_mask(rx->bind_thread) & all_threads_mask);
+ fd_insert(fd, rx->owner, rx->iocb, rx->bind_thread & all_threads_mask);
/* for now, all regularly bound TCP listeners are exportable */
if (!(rx->flags & RX_F_INHERITED))
diff --git a/src/sock_unix.c b/src/sock_unix.c
index 143295e..6544ccf 100644
--- a/src/sock_unix.c
+++ b/src/sock_unix.c
@@ -284,7 +284,7 @@
rx->fd = fd;
rx->flags |= RX_F_BOUND;
- fd_insert(fd, rx->owner, rx->iocb, thread_mask(rx->bind_thread) & all_threads_mask);
+ fd_insert(fd, rx->owner, rx->iocb, rx->bind_thread & all_threads_mask);
/* for now, all regularly bound TCP listeners are exportable */
if (!(rx->flags & RX_F_INHERITED))