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

Set isthreaded when enabling background_thread.

Browse Source
This commit is contained in:
Qi Wang 2017-06-01 12:52:09 -07:00 committed by Qi Wang
parent c84ec3e9da
commit 340071f0cf
3 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/jemalloc/internal/background_thread_externs.h
View File

@ -20,6 +20,7 @@ void background_thread_postfork_parent(tsdn_t *tsdn);
void background_thread_postfork_child(tsdn_t *tsdn); void background_thread_postfork_child(tsdn_t *tsdn);
bool background_thread_stats_read(tsdn_t *tsdn, bool background_thread_stats_read(tsdn_t *tsdn,
background_thread_stats_t *stats); background_thread_stats_t *stats);
void background_thread_ctl_init(tsdn_t *tsdn);
#ifdef JEMALLOC_PTHREAD_CREATE_WRAPPER #ifdef JEMALLOC_PTHREAD_CREATE_WRAPPER
extern int pthread_create_wrapper(pthread_t *__restrict, const pthread_attr_t *, extern int pthread_create_wrapper(pthread_t *__restrict, const pthread_attr_t *,

62
src/background_thread.c
View File

@ -22,6 +22,29 @@ background_thread_info_t *background_thread_info;
/******************************************************************************/ /******************************************************************************/
#ifdef JEMALLOC_PTHREAD_CREATE_WRAPPER
#include <dlfcn.h>
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) {
#ifdef JEMALLOC_LAZY_LOCK
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);
return pthread_create_fptr(thread, attr, start_routine, arg);
}
#endif /* JEMALLOC_PTHREAD_CREATE_WRAPPER */
#ifndef JEMALLOC_BACKGROUND_THREAD #ifndef JEMALLOC_BACKGROUND_THREAD
#define NOT_REACHED { not_reached(); } #define NOT_REACHED { not_reached(); }
bool background_thread_create(tsd_t *tsd, unsigned arena_ind) NOT_REACHED bool background_thread_create(tsd_t *tsd, unsigned arena_ind) NOT_REACHED
@ -37,6 +60,7 @@ void background_thread_postfork_parent(tsdn_t *tsdn) NOT_REACHED
void background_thread_postfork_child(tsdn_t *tsdn) NOT_REACHED void background_thread_postfork_child(tsdn_t *tsdn) NOT_REACHED
bool background_thread_stats_read(tsdn_t *tsdn, bool background_thread_stats_read(tsdn_t *tsdn,
background_thread_stats_t *stats) NOT_REACHED background_thread_stats_t *stats) NOT_REACHED
void background_thread_ctl_init(tsdn_t *tsdn) NOT_REACHED
#undef NOT_REACHED #undef NOT_REACHED
#else #else
@ -600,31 +624,19 @@ 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
#endif /* defined(JEMALLOC_BACKGROUND_THREAD) */ /*
* When lazy lock is enabled, we need to make sure setting isthreaded before
#ifdef JEMALLOC_PTHREAD_CREATE_WRAPPER * taking any background_thread locks. This is called early in ctl (instead of
#include <dlfcn.h> * wait for the pthread_create calls to trigger) because the mutex is required
* before creating background threads.
static int (*pthread_create_fptr)(pthread_t *__restrict, const pthread_attr_t *, */
void *(*)(void *), void *__restrict); void
background_thread_ctl_init(tsdn_t *tsdn) {
static void malloc_mutex_assert_not_owner(tsdn, &background_thread_lock);
pthread_create_wrapper_once(void) {
#ifdef JEMALLOC_LAZY_LOCK
isthreaded = true;
#endif
}
int
pthread_create_wrapper(pthread_t *__restrict thread, const pthread_attr_t *attr,
void *(*start_routine)(void *), void *__restrict arg) {
static pthread_once_t once_control = PTHREAD_ONCE_INIT;
pthread_once(&once_control, pthread_create_wrapper_once); pthread_once(&once_control, pthread_create_wrapper_once);
return pthread_create_fptr(thread, attr, start_routine, arg);
} }
#endif
#endif /* defined(JEMALLOC_BACKGROUND_THREAD) */
bool bool
background_thread_boot0(void) { background_thread_boot0(void) {
@ -658,6 +670,10 @@ background_thread_boot1(tsdn_t *tsdn) {
malloc_mutex_rank_exclusive)) { malloc_mutex_rank_exclusive)) {
return true; return true;
} }
if (opt_background_thread) {
background_thread_ctl_init(tsdn);
}
background_thread_info = (background_thread_info_t *)base_alloc(tsdn, background_thread_info = (background_thread_info_t *)base_alloc(tsdn,
b0get(), ncpus * sizeof(background_thread_info_t), CACHELINE); b0get(), ncpus * sizeof(background_thread_info_t), CACHELINE);
if (background_thread_info == NULL) { if (background_thread_info == NULL) {

1
src/ctl.c
View File

@ -1499,6 +1499,7 @@ background_thread_ctl(tsd_t *tsd, const size_t *mib, size_t miblen,
if (!have_background_thread) { if (!have_background_thread) {
return ENOENT; return ENOENT;
} }
background_thread_ctl_init(tsd_tsdn(tsd));
malloc_mutex_lock(tsd_tsdn(tsd), &background_thread_lock); malloc_mutex_lock(tsd_tsdn(tsd), &background_thread_lock);
if (newp == NULL) { if (newp == NULL) {