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

Return early in _malloc_{pre,post}fork() if uninitialized.

Browse Source 
Avoid mutex operations in _malloc_{pre,post}fork() unless jemalloc has
been initialized.

Reported by David Xu.
This commit is contained in:
Jason Evans 2012-05-11 17:40:16 -07:00
parent d8ceef6c55
commit 58ad1e4956
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/jemalloc.c
View File

@ -1621,6 +1621,12 @@ _malloc_prefork(void)
{ {
unsigned i; unsigned i;
#ifdef JEMALLOC_MUTEX_INIT_CB
if (malloc_initialized == false)
return;
#endif
assert(malloc_initialized);
/* Acquire all mutexes in a safe order. */ /* Acquire all mutexes in a safe order. */
malloc_mutex_prefork(&arenas_lock); malloc_mutex_prefork(&arenas_lock);
for (i = 0; i < narenas; i++) { for (i = 0; i < narenas; i++) {
@ -1642,6 +1648,12 @@ _malloc_postfork(void)
{ {
unsigned i; unsigned i;
#ifdef JEMALLOC_MUTEX_INIT_CB
if (malloc_initialized == false)
return;
#endif
assert(malloc_initialized);
/* Release all mutexes, now that fork() has completed. */ /* Release all mutexes, now that fork() has completed. */
chunk_dss_postfork_parent(); chunk_dss_postfork_parent();
huge_postfork_parent(); huge_postfork_parent();
@ -1658,6 +1670,8 @@ jemalloc_postfork_child(void)
{ {
unsigned i; unsigned i;
assert(malloc_initialized);
/* Release all mutexes, now that fork() has completed. */ /* Release all mutexes, now that fork() has completed. */
chunk_dss_postfork_child(); chunk_dss_postfork_child();
huge_postfork_child(); huge_postfork_child();