project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Invoke dlsym() on demand.

Browse Source 
If no lazy lock or background thread is enabled, avoid dlsym pthread_create on
boot.
This commit is contained in:
Qi Wang 2018-04-11 11:54:11 -07:00 committed by Qi Wang
parent c95284df1a
commit dedfeecc4e
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/background_thread.c
View File

@ -804,6 +804,26 @@ background_thread_stats_read(tsdn_t *tsdn, background_thread_stats_t *stats) {
#undef BILLION #undef BILLION
#undef BACKGROUND_THREAD_MIN_INTERVAL_NS #undef BACKGROUND_THREAD_MIN_INTERVAL_NS
static bool
pthread_create_fptr_init(void) {
if (pthread_create_fptr != NULL) {
return false;
}
pthread_create_fptr = dlsym(RTLD_NEXT, "pthread_create");
if (pthread_create_fptr == NULL) {
can_enable_background_thread = false;
if (config_lazy_lock || opt_background_thread) {
malloc_write("<jemalloc>: Error in dlsym(RTLD_NEXT, "
"\"pthread_create\")\n");
abort();
}
} else {
can_enable_background_thread = true;
}
return false;
}
/* /*
* When lazy lock is enabled, we need to make sure setting isthreaded before * When lazy lock is enabled, we need to make sure setting isthreaded before
* taking any background_thread locks. This is called early in ctl (instead of * taking any background_thread locks. This is called early in ctl (instead of
@ -814,6 +834,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_create_fptr_init();
pthread_create_wrapper_init(); pthread_create_wrapper_init();
#endif #endif
} }
@ -827,18 +848,10 @@ background_thread_boot0(void) {
"supports pthread only\n"); "supports pthread only\n");
return true; return true;
} }
#ifdef JEMALLOC_PTHREAD_CREATE_WRAPPER #ifdef JEMALLOC_PTHREAD_CREATE_WRAPPER
pthread_create_fptr = dlsym(RTLD_NEXT, "pthread_create"); if ((config_lazy_lock || opt_background_thread) &&
if (pthread_create_fptr == NULL) { pthread_create_fptr_init()) {
can_enable_background_thread = false; return true;
if (config_lazy_lock || opt_background_thread) {
malloc_write("<jemalloc>: Error in dlsym(RTLD_NEXT, "
"\"pthread_create\")\n");
abort();
}
} else {
can_enable_background_thread = true;
} }
#endif #endif
return false; return false;