From 091d827e096ea97b95af99d3366bc0115d0a24a8 Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Sun, 24 Jun 2018 09:37:03 +0200 Subject: [PATCH] BUG/BUILD: threads: unbreak build without threads The build without threads was once again broken. This issue was introduced in commit ba86c6c ("MINOR: threads: Be sure to remove threads from all_threads_mask on exit"). This is exactly the same problem as last time it happened, because of all_threads_mask not being defined with USE_THREAD= This must be backported in 1.8 --- src/haproxy.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/haproxy.c b/src/haproxy.c index 11d1d47ce..4101cefa1 100644 --- a/src/haproxy.c +++ b/src/haproxy.c @@ -2473,9 +2473,8 @@ static void *run_thread_poll_loop(void *data) list_for_each_entry(ptdf, &per_thread_deinit_list, list) ptdf->fct(); - HA_ATOMIC_AND(&all_threads_mask, ~tid_bit); - #ifdef USE_THREAD + HA_ATOMIC_AND(&all_threads_mask, ~tid_bit); if (tid > 0) pthread_exit(NULL); #endif