diff options
| author | Joerg Koenig <jck@techsat.com> | 2018-01-19 10:53:15 (GMT) |
|---|---|---|
| committer | Joerg Koenig <jck@techsat.com> | 2018-01-19 10:53:15 (GMT) |
| commit | aa502047980c13cdbe5a1adb7f024199c367254d (patch) | |
| tree | 8cc6a214bde51a42beb77ac92fe0d00dd44c0c90 /src/background_thread.c | |
| parent | 3f5049340e66c6929c3270f7359617f62e053b11 (diff) | |
| parent | f78d4ca3fbff6cab0c704c787706a53ddafcbe13 (diff) | |
| download | jemalloc-master.zip jemalloc-master.tar.gz jemalloc-master.tar.bz2 | |
Change-Id: I44881ca21f4710f7ad5154a45c4a7204ae71c84c
Diffstat (limited to 'src/background_thread.c')
| -rw-r--r-- | src/background_thread.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/background_thread.c b/src/background_thread.c index eb30eb5..6baff22 100644 --- a/src/background_thread.c +++ b/src/background_thread.c @@ -30,19 +30,20 @@ bool can_enable_background_thread; static int (*pthread_create_fptr)(pthread_t *__restrict, const pthread_attr_t *, void *(*)(void *), void *__restrict); -static pthread_once_t once_control = PTHREAD_ONCE_INIT; static void -pthread_create_wrapper_once(void) { +pthread_create_wrapper_init(void) { #ifdef JEMALLOC_LAZY_LOCK - isthreaded = true; + if (!isthreaded) { + isthreaded = true; + } #endif } int pthread_create_wrapper(pthread_t *__restrict thread, const pthread_attr_t *attr, 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); } @@ -805,7 +806,7 @@ void background_thread_ctl_init(tsdn_t *tsdn) { malloc_mutex_assert_not_owner(tsdn, &background_thread_lock); #ifdef JEMALLOC_PTHREAD_CREATE_WRAPPER - pthread_once(&once_control, pthread_create_wrapper_once); + pthread_create_wrapper_init(); #endif } @@ -848,9 +849,6 @@ background_thread_boot1(tsdn_t *tsdn) { malloc_mutex_rank_exclusive)) { return true; } - if (opt_background_thread) { - background_thread_ctl_init(tsdn); - } background_thread_info = (background_thread_info_t *)base_alloc(tsdn, b0get(), ncpus * sizeof(background_thread_info_t), CACHELINE); |