RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
William Lallemand 2018-06-24 09:37:03 +02:00 committed by Willy Tarreau
parent ac1f3ed64b
commit 091d827e09
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/haproxy.c
View File

@ -2473,9 +2473,8 @@ static void *run_thread_poll_loop(void *data)
list_for_each_entry(ptdf, &per_thread_deinit_list, list) list_for_each_entry(ptdf, &per_thread_deinit_list, list)
ptdf->fct(); ptdf->fct();
HA_ATOMIC_AND(&all_threads_mask, ~tid_bit);
#ifdef USE_THREAD #ifdef USE_THREAD
HA_ATOMIC_AND(&all_threads_mask, ~tid_bit);
if (tid > 0) if (tid > 0)
pthread_exit(NULL); pthread_exit(NULL);
#endif #endif