Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libc/stdlib Hold arenas_mtx across (still unused) _mallo...



details:   https://anonhg.NetBSD.org/src/rev/429b123c009f
branches:  trunk
changeset: 330636:429b123c009f
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 16 19:09:53 2014 +0000

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

diffstat:

 lib/libc/stdlib/jemalloc.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 474f77b59615 -r 429b123c009f lib/libc/stdlib/jemalloc.c
--- a/lib/libc/stdlib/jemalloc.c        Wed Jul 16 19:05:42 2014 +0000
+++ b/lib/libc/stdlib/jemalloc.c        Wed Jul 16 19:09:53 2014 +0000
@@ -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@localhost>.
@@ -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 @@
                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_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);



Home | Main Index | Thread Index | Old Index