upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-02-23 01:42:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

BUG/MEDIUM: threads: Disable the workaround to load libgcc_s on macOS

Browse source 
Don't use the workaround to load libgcc_s on macOS. It is not needed
there, and it causes issues, as recent macOS dislike processes that fork
after threads where created (and the workaround creates a temporary
thread). This fixes crashes on macOS at least when using master-worker,
and using the system resolver.

This should fix Github issue #3035

This should be backported up to 2.8.
This commit is contained in:
Olivier Houchard 2025-07-17 19:27:39 +02:00 committed by Olivier Houchard
parent 5b45251d19
commit f8e9545f70
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/thread.c
View file

@ -1213,6 +1213,7 @@ int pthread_rwlock_unlock(pthread_rwlock_t *rwlock)
}
#endif // defined(USE_PTHREAD_EMULATION)
#ifndef __APPLE__
/* Depending on the platform and how libpthread was built, pthread_exit() may
* involve some code in libgcc_s that would be loaded on exit for the first
* time, causing aborts if the process is chrooted. It's harmless bit very
@ -1233,12 +1234,15 @@ static inline void preload_libgcc_s(void)
if (pthread_create(&dummy_thread, NULL, dummy_thread_function, NULL) == 0)
pthread_join(dummy_thread, NULL);
}
#endif
static void __thread_init(void)
{
char *ptr = NULL;
#ifndef __APPLE__
preload_libgcc_s();
#endif
thread_cpus_enabled_at_boot = thread_cpus_enabled();
thread_cpus_enabled_at_boot = MIN(thread_cpus_enabled_at_boot, MAX_THREADS);