Set isthreaded manually.

Avoid relying pthread_once which creates dependency during init.
This commit is contained in:
Qi Wang 2017-10-05 14:56:49 -07:00 committed by Qi Wang
parent a2e6eb2c22
commit 7e74093c96

View File

@ -30,19 +30,20 @@ bool can_enable_background_thread;
static int (*pthread_create_fptr)(pthread_t *__restrict, const pthread_attr_t *, static int (*pthread_create_fptr)(pthread_t *__restrict, const pthread_attr_t *,
void *(*)(void *), void *__restrict); void *(*)(void *), void *__restrict);
static pthread_once_t once_control = PTHREAD_ONCE_INIT;
static void static void
pthread_create_wrapper_once(void) { pthread_create_wrapper_init(void) {
#ifdef JEMALLOC_LAZY_LOCK #ifdef JEMALLOC_LAZY_LOCK
if (!isthreaded) {
isthreaded = true; isthreaded = true;
}
#endif #endif
} }
int int
pthread_create_wrapper(pthread_t *__restrict thread, const pthread_attr_t *attr, pthread_create_wrapper(pthread_t *__restrict thread, const pthread_attr_t *attr,
void *(*start_routine)(void *), void *__restrict arg) { void *(*start_routine)(void *), void *__restrict arg) {
pthread_once(&once_control, pthread_create_wrapper_once); pthread_create_wrapper_init();
return pthread_create_fptr(thread, attr, start_routine, arg); return pthread_create_fptr(thread, attr, start_routine, arg);
} }
@ -805,7 +806,7 @@ void
background_thread_ctl_init(tsdn_t *tsdn) { background_thread_ctl_init(tsdn_t *tsdn) {
malloc_mutex_assert_not_owner(tsdn, &background_thread_lock); malloc_mutex_assert_not_owner(tsdn, &background_thread_lock);
#ifdef JEMALLOC_PTHREAD_CREATE_WRAPPER #ifdef JEMALLOC_PTHREAD_CREATE_WRAPPER
pthread_once(&once_control, pthread_create_wrapper_once); pthread_create_wrapper_init();
#endif #endif
} }