summaryrefslogtreecommitdiff
path: root/lib/libc/stdlib/jemalloc.c
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2014-07-16 19:09:53 +0000
committerriastradh <riastradh@NetBSD.org>2014-07-16 19:09:53 +0000
commited29a9bd14107bd3fa8cf1472d80554d9bd2bc01 (patch)
treece54ffd50e05a7a2d2cfbfa60900a2394058ec68 /lib/libc/stdlib/jemalloc.c
parent3989c4b9049c5036ac41ceb812f2481c98990266 (diff)
Hold arenas_mtx across (still unused) _malloc_pre/postfork (PR 47428).
Diffstat (limited to 'lib/libc/stdlib/jemalloc.c')
-rw-r--r--lib/libc/stdlib/jemalloc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/libc/stdlib/jemalloc.c b/lib/libc/stdlib/jemalloc.c
index fc8d9bbb904..751191de106 100644
--- a/lib/libc/stdlib/jemalloc.c
+++ b/lib/libc/stdlib/jemalloc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: jemalloc.c,v 1.32 2014/02/25 12:13:19 martin Exp $ */
+/* $NetBSD: jemalloc.c,v 1.33 2014/07/16 19:09:53 riastradh Exp $ */
/*-
* Copyright (C) 2006,2007 Jason Evans <jasone@FreeBSD.org>.
@@ -118,7 +118,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $"); */
-__RCSID("$NetBSD: jemalloc.c,v 1.32 2014/02/25 12:13:19 martin Exp $");
+__RCSID("$NetBSD: jemalloc.c,v 1.33 2014/07/16 19:09:53 riastradh Exp $");
#ifdef __FreeBSD__
#include "libc_private.h"
@@ -3928,7 +3928,6 @@ _malloc_prefork(void)
if (arenas[i] != NULL)
malloc_mutex_lock(&arenas[i]->mtx);
}
- malloc_mutex_unlock(&arenas_mtx);
malloc_mutex_lock(&base_mtx);
@@ -3946,7 +3945,6 @@ _malloc_postfork(void)
malloc_mutex_unlock(&base_mtx);
- malloc_mutex_lock(&arenas_mtx);
for (i = 0; i < narenas; i++) {
if (arenas[i] != NULL)
malloc_mutex_unlock(&arenas[i]->mtx);