From 5e954e1f27729f85eabc4fe4159a3460774f3abc Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 30 Jul 2018 10:44:51 +0200 Subject: [PATCH] BUG/MEDIUM: threads: properly fix nbthreads == MAX_THREADS While moving Olivier's patch for nbthread==MAX_THREADS in commit 3e12304 ("BUG/MINOR: threads: Handle nbthread == MAX_THREADS.") to hathreads.c, I missed one place resulting in the computed thread mask being used as the thread count, which is worse than the initial bug. Let's fix it properly this time. This fix must be backported to 1.8 just like the other one. --- src/haproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/haproxy.c b/src/haproxy.c index a17439163..8525593e2 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -3030,7 +3030,7 @@ int main(int argc, char **argv) int i; sigset_t blocked_sig, old_sig; - THREAD_SYNC_INIT((1UL << global.nbthread) - 1); + THREAD_SYNC_INIT(global.nbthread); /* Init tids array */ for (i = 0; i < global.nbthread; i++)