MINOR: threads: make use of thread_mask() to simplify some thread calculations

By doing so it's visible that some fd_insert() calls were relying on
MAX_THREADS while all_threads_mask should have been more suitable.

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 917fe0caea48bf02302d859f0ef2abc345e64366..3e8a7f5c3a0788550a1d1fe2d7aef1d0e52aef12 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -2287,8 +2287,8 @@ int check_config_validity()
 
                        /* detect and address thread affinity inconsistencies */
                        nbproc = my_ffsl(proc_mask(bind_conf->bind_proc)) - 1;
-                       mask = bind_conf->bind_thread[nbproc];
-                       if (mask && !(mask & all_threads_mask)) {
+                       mask = thread_mask(bind_conf->bind_thread[nbproc]);
+                       if (!(mask & all_threads_mask)) {
                                unsigned long new_mask = 0;
 
                                while (mask) {

diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index 068b24f609303fa3f60f52cb5b70643dabbbde9b..9105dd2f9e0234c9ad302d6466eb069ae8f366f6 100644 (file)
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -153,8 +153,7 @@ static int sockpair_bind_listener(struct listener *listener, char *errmsg, int e
        listener->state = LI_LISTEN;
 
        fd_insert(fd, listener, listener->proto->accept,
-                 listener->bind_conf->bind_thread[relative_pid-1] ?
-                 listener->bind_conf->bind_thread[relative_pid-1] : MAX_THREADS_MASK);
+                 thread_mask(listener->bind_conf->bind_thread[relative_pid-1]));
 
        return err;
 

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 52a4691d2ba93aec93a3e8a0edd1e90d93de968d..e4b8f63d75e8271852f15508feaf8f31816d22da 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -1076,8 +1076,7 @@ int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen)
        listener->state = LI_LISTEN;
 
        fd_insert(fd, listener, listener->proto->accept,
-                 listener->bind_conf->bind_thread[relative_pid-1] ?
-                 listener->bind_conf->bind_thread[relative_pid-1] : MAX_THREADS_MASK);
+                 thread_mask(listener->bind_conf->bind_thread[relative_pid-1]));
 
  tcp_return:
        if (msg && errlen) {

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index 965b7cb84f4c9dd4bee34256679b4fdfddf53a39..7fc145b8cf5d74d744d6accad3e68f87336d471e 100644 (file)
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -340,8 +340,7 @@ static int uxst_bind_listener(struct listener *listener, char *errmsg, int errle
        listener->state = LI_LISTEN;
 
        fd_insert(fd, listener, listener->proto->accept,
-                 listener->bind_conf->bind_thread[relative_pid-1] ?
-                 listener->bind_conf->bind_thread[relative_pid-1] : MAX_THREADS_MASK);
+                 thread_mask(listener->bind_conf->bind_thread[relative_pid-1]));
 
        return err;