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

Handle log_mtx during forking

Browse Source
This commit is contained in:
Yinan Zhang 2019-12-20 10:38:05 -08:00
parent ea42174d07
commit 112dc36dd5
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/jemalloc/internal/prof_log_externs.h
View File

@ -3,6 +3,8 @@
#include "jemalloc/internal/mutex.h" #include "jemalloc/internal/mutex.h"
extern malloc_mutex_t log_mtx;
void prof_try_log(tsd_t *tsd, size_t usize, prof_info_t *prof_info); void prof_try_log(tsd_t *tsd, size_t usize, prof_info_t *prof_info);
bool prof_log_init(tsd_t *tsdn); bool prof_log_init(tsd_t *tsdn);
#ifdef JEMALLOC_JET #ifdef JEMALLOC_JET

3
src/prof.c
View File

@ -1119,6 +1119,7 @@ prof_prefork0(tsdn_t *tsdn) {
for (i = 0; i < PROF_NTDATA_LOCKS; i++) { for (i = 0; i < PROF_NTDATA_LOCKS; i++) {
malloc_mutex_prefork(tsdn, &tdata_locks[i]); malloc_mutex_prefork(tsdn, &tdata_locks[i]);
} }
malloc_mutex_prefork(tsdn, &log_mtx);
for (i = 0; i < PROF_NCTX_LOCKS; i++) { for (i = 0; i < PROF_NCTX_LOCKS; i++) {
malloc_mutex_prefork(tsdn, &gctx_locks[i]); malloc_mutex_prefork(tsdn, &gctx_locks[i]);
} }
@ -1150,6 +1151,7 @@ prof_postfork_parent(tsdn_t *tsdn) {
for (i = 0; i < PROF_NCTX_LOCKS; i++) { for (i = 0; i < PROF_NCTX_LOCKS; i++) {
malloc_mutex_postfork_parent(tsdn, &gctx_locks[i]); malloc_mutex_postfork_parent(tsdn, &gctx_locks[i]);
} }
malloc_mutex_postfork_parent(tsdn, &log_mtx);
for (i = 0; i < PROF_NTDATA_LOCKS; i++) { for (i = 0; i < PROF_NTDATA_LOCKS; i++) {
malloc_mutex_postfork_parent(tsdn, &tdata_locks[i]); malloc_mutex_postfork_parent(tsdn, &tdata_locks[i]);
} }
@ -1172,6 +1174,7 @@ prof_postfork_child(tsdn_t *tsdn) {
for (i = 0; i < PROF_NCTX_LOCKS; i++) { for (i = 0; i < PROF_NCTX_LOCKS; i++) {
malloc_mutex_postfork_child(tsdn, &gctx_locks[i]); malloc_mutex_postfork_child(tsdn, &gctx_locks[i]);
} }
malloc_mutex_postfork_child(tsdn, &log_mtx);
for (i = 0; i < PROF_NTDATA_LOCKS; i++) { for (i = 0; i < PROF_NTDATA_LOCKS; i++) {
malloc_mutex_postfork_child(tsdn, &tdata_locks[i]); malloc_mutex_postfork_child(tsdn, &tdata_locks[i]);
} }

2
src/prof_log.c
View File

@ -104,7 +104,7 @@ static prof_alloc_node_t *log_alloc_first = NULL;
static prof_alloc_node_t *log_alloc_last = NULL; static prof_alloc_node_t *log_alloc_last = NULL;
/* Protects the prof_logging_state and any log_{...} variable. */ /* Protects the prof_logging_state and any log_{...} variable. */
static malloc_mutex_t log_mtx; malloc_mutex_t log_mtx;
/******************************************************************************/ /******************************************************************************/
/* /*