summaryrefslogtreecommitdiffstats
path: root/include/jemalloc
diff options
context:
space:
mode:
authorJason Evans <jasone@canonware.com>2016-04-26 17:47:22 (GMT)
committerJason Evans <jasone@canonware.com>2016-04-26 17:47:22 (GMT)
commit108c4a11e96d57fd71751efa23ab986a236a0c7d (patch)
tree4b114e09628d921d3da62095ec4a5c1d5d5ec3e6 /include/jemalloc
parent174c0c3a9c63b3a0bfa32381148b537e9b9af96d (diff)
downloadjemalloc-108c4a11e96d57fd71751efa23ab986a236a0c7d.zip
jemalloc-108c4a11e96d57fd71751efa23ab986a236a0c7d.tar.gz
jemalloc-108c4a11e96d57fd71751efa23ab986a236a0c7d.tar.bz2
Fix witness/fork() interactions.
Fix witness to clear its list of owned mutexes in the child if platform-specific malloc_mutex code re-initializes mutexes rather than unlocking them.
Diffstat (limited to 'include/jemalloc')
-rw-r--r--include/jemalloc/internal/private_symbols.txt3
-rw-r--r--include/jemalloc/internal/witness.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/include/jemalloc/internal/private_symbols.txt b/include/jemalloc/internal/private_symbols.txt
index 0eb7778..de884fc 100644
--- a/include/jemalloc/internal/private_symbols.txt
+++ b/include/jemalloc/internal/private_symbols.txt
@@ -594,7 +594,8 @@ witness_lock_error
witness_lockless_error
witness_not_owner_error
witness_owner_error
-witness_postfork
+witness_postfork_child
+witness_postfork_parent
witness_prefork
witness_unlock
witnesses_cleanup
diff --git a/include/jemalloc/internal/witness.h b/include/jemalloc/internal/witness.h
index ecdc034..b2e6e82 100644
--- a/include/jemalloc/internal/witness.h
+++ b/include/jemalloc/internal/witness.h
@@ -96,7 +96,8 @@ void witness_assert_lockless(tsd_t *tsd);
void witnesses_cleanup(tsd_t *tsd);
void witness_fork_cleanup(tsd_t *tsd);
void witness_prefork(tsd_t *tsd);
-void witness_postfork(tsd_t *tsd);
+void witness_postfork_parent(tsd_t *tsd);
+void witness_postfork_child(tsd_t *tsd);
#endif /* JEMALLOC_H_EXTERNS */
/******************************************************************************/