CVS commit: src/lib/libc/stdlib

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Wed Jul 16 19:09:53 UTC 2014

Modified Files:
        src/lib/libc/stdlib: jemalloc.c

Log Message:
Hold arenas_mtx across (still unused) _malloc_pre/postfork (PR 47428).


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/lib/libc/stdlib/jemalloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/lib/libc/stdlib/jemalloc.c
diff -u src/lib/libc/stdlib/jemalloc.c:1.32 src/lib/libc/stdlib/jemalloc.c:1.33
--- src/lib/libc/stdlib/jemalloc.c:1.32	Tue Feb 25 12:13:19 2014
+++ src/lib/libc/stdlib/jemalloc.c	Wed Jul 16 19:09:53 2014
@@ -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 <jas...@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);