From f1c3da8b02489b7728d4275ac011336299eace62 Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Mon, 21 Oct 2013 14:59:10 -0700 Subject: [PATCH] Consistently use malloc_mutex_prefork(). Consistently use malloc_mutex_prefork() instead of malloc_mutex_lock() in all prefork functions. --- src/chunk.c | 2 +- src/ctl.c | 2 +- src/prof.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/chunk.c b/src/chunk.c index b17f43f0..a93d28aa 100644 --- a/src/chunk.c +++ b/src/chunk.c @@ -368,7 +368,7 @@ void chunk_prefork(void) { - malloc_mutex_lock(&chunks_mtx); + malloc_mutex_prefork(&chunks_mtx); if (config_ivsalloc) rtree_prefork(chunks_rtree); chunk_dss_prefork(); diff --git a/src/ctl.c b/src/ctl.c index ebba7c25..68ffba35 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -929,7 +929,7 @@ void ctl_prefork(void) { - malloc_mutex_lock(&ctl_mtx); + malloc_mutex_prefork(&ctl_mtx); } void diff --git a/src/prof.c b/src/prof.c index 4a12d1f9..c0dad860 100644 --- a/src/prof.c +++ b/src/prof.c @@ -1245,10 +1245,10 @@ prof_prefork(void) if (opt_prof) { unsigned i; - malloc_mutex_lock(&bt2ctx_mtx); - malloc_mutex_lock(&prof_dump_seq_mtx); + malloc_mutex_prefork(&bt2ctx_mtx); + malloc_mutex_prefork(&prof_dump_seq_mtx); for (i = 0; i < PROF_NCTX_LOCKS; i++) - malloc_mutex_lock(&ctx_locks[i]); + malloc_mutex_prefork(&ctx_locks[i]); } }