summaryrefslogtreecommitdiffstats
path: root/include/jemalloc
diff options
context:
space:
mode:
authorQi Wang <interwq@gwu.edu>2017-03-08 21:00:42 (GMT)
committerQi Wang <interwq@gmail.com>2017-03-09 07:07:27 (GMT)
commit8721e19c0414dce0f47a627ff948130d4294b4d7 (patch)
treea9121130ccf0f6da50a306f276a0d8ce0a917348 /include/jemalloc
parent8adab269721b0271399027d45a8aa6b425e53fd9 (diff)
downloadjemalloc-8721e19c0414dce0f47a627ff948130d4294b4d7.zip
jemalloc-8721e19c0414dce0f47a627ff948130d4294b4d7.tar.gz
jemalloc-8721e19c0414dce0f47a627ff948130d4294b4d7.tar.bz2
Fix arena_prefork lock rank order for witness.
When witness is enabled, lock rank order needs to be preserved during prefork, not only for each arena, but also across arenas. This change breaks arena_prefork into further stages to ensure valid rank order across arenas. Also changed test/unit/fork to use a manual arena to catch this case.
Diffstat (limited to 'include/jemalloc')
-rw-r--r--include/jemalloc/internal/arena_externs.h3
-rw-r--r--include/jemalloc/internal/private_symbols.txt3
2 files changed, 6 insertions, 0 deletions
diff --git a/include/jemalloc/internal/arena_externs.h b/include/jemalloc/internal/arena_externs.h
index 36d9186..2df5518 100644
--- a/include/jemalloc/internal/arena_externs.h
+++ b/include/jemalloc/internal/arena_externs.h
@@ -82,6 +82,9 @@ void arena_prefork0(tsdn_t *tsdn, arena_t *arena);
void arena_prefork1(tsdn_t *tsdn, arena_t *arena);
void arena_prefork2(tsdn_t *tsdn, arena_t *arena);
void arena_prefork3(tsdn_t *tsdn, arena_t *arena);
+void arena_prefork4(tsdn_t *tsdn, arena_t *arena);
+void arena_prefork5(tsdn_t *tsdn, arena_t *arena);
+void arena_prefork6(tsdn_t *tsdn, arena_t *arena);
void arena_postfork_parent(tsdn_t *tsdn, arena_t *arena);
void arena_postfork_child(tsdn_t *tsdn, arena_t *arena);
diff --git a/include/jemalloc/internal/private_symbols.txt b/include/jemalloc/internal/private_symbols.txt
index 30cd395..64bea33 100644
--- a/include/jemalloc/internal/private_symbols.txt
+++ b/include/jemalloc/internal/private_symbols.txt
@@ -51,6 +51,9 @@ arena_prefork0
arena_prefork1
arena_prefork2
arena_prefork3
+arena_prefork4
+arena_prefork5
+arena_prefork6
arena_prof_accum
arena_prof_promote
arena_prof_tctx_get