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

Track background thread status separately at fork.

Browse Source 
Use a separate boolean to track the enabled status, instead of leaving the
global background thread status inconsistent.
This commit is contained in:
Qi Wang 2017-05-30 18:05:27 -07:00 committed by Qi Wang
parent 2e4d1a4e30
commit 66813916b5
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/background_thread.c
View File

@ -41,6 +41,8 @@ bool background_thread_stats_read(tsdn_t *tsdn,
#undef NOT_REACHED #undef NOT_REACHED
#else #else
static bool background_thread_enabled_at_fork;
static void static void
background_thread_info_reinit(tsdn_t *tsdn, background_thread_info_t *info) { background_thread_info_reinit(tsdn_t *tsdn, background_thread_info_t *info) {
background_thread_wakeup_time_set(tsdn, info, 0); background_thread_wakeup_time_set(tsdn, info, 0);
@ -548,10 +550,11 @@ void
background_thread_prefork0(tsdn_t *tsdn) { background_thread_prefork0(tsdn_t *tsdn) {
malloc_mutex_prefork(tsdn, &background_thread_lock); malloc_mutex_prefork(tsdn, &background_thread_lock);
if (background_thread_enabled()) { if (background_thread_enabled()) {
background_thread_enabled_at_fork = true;
background_thread_enabled_set(tsdn, false); background_thread_enabled_set(tsdn, false);
background_threads_disable(tsdn_tsd(tsdn)); background_threads_disable(tsdn_tsd(tsdn));
/* Enable again to re-create threads after fork. */ } else {
background_thread_enabled_set(tsdn, true); background_thread_enabled_at_fork = false;
} }
assert(n_background_threads == 0); assert(n_background_threads == 0);
} }
@ -565,7 +568,9 @@ background_thread_prefork1(tsdn_t *tsdn) {
static void static void
background_thread_postfork_init(tsdn_t *tsdn) { background_thread_postfork_init(tsdn_t *tsdn) {
if (background_thread_enabled()) { assert(n_background_threads == 0);
if (background_thread_enabled_at_fork) {
background_thread_enabled_set(tsdn, true);
background_threads_enable(tsdn_tsd(tsdn)); background_threads_enable(tsdn_tsd(tsdn));
} }
} }