CVS commit: [netbsd-6] src/lib/libc/stdlib

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Mon Nov  3 15:45:46 UTC 2014

Modified Files:
        src/lib/libc/stdlib [netbsd-6]: jemalloc.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1121):
        lib/libc/stdlib/jemalloc.c: revision 1.33
Hold arenas_mtx across (still unused) _malloc_pre/postfork (PR 47428).


To generate a diff of this commit:
cvs rdiff -u -r1.24.6.2 -r1.24.6.3 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.24.6.2 src/lib/libc/stdlib/jemalloc.c:1.24.6.3
--- src/lib/libc/stdlib/jemalloc.c:1.24.6.2	Mon Apr 23 23:40:40 2012
+++ src/lib/libc/stdlib/jemalloc.c	Mon Nov  3 15:45:45 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: jemalloc.c,v 1.24.6.2 2012/04/23 23:40:40 riz Exp $	*/
+/*	$NetBSD: jemalloc.c,v 1.24.6.3 2014/11/03 15:45:45 msaitoh 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.24.6.2 2012/04/23 23:40:40 riz Exp $");
+__RCSID("$NetBSD: jemalloc.c,v 1.24.6.3 2014/11/03 15:45:45 msaitoh Exp $");
 
 #ifdef __FreeBSD__
 #include "libc_private.h"
@@ -3915,7 +3915,6 @@ _malloc_prefork(void)
 		if (arenas[i] != NULL)
 			malloc_mutex_lock(&arenas[i]->mtx);
 	}
-	malloc_mutex_unlock(&arenas_mtx);
 
 	malloc_mutex_lock(&base_mtx);
 
@@ -3933,7 +3932,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);