 @@ -1,14 +1,14 @@
-/*	$NetBSD: jemalloc.c,v 1.37 2015/01/20 18:31:25 christos Exp $	*/
+/*	$NetBSD: jemalloc.c,v 1.38 2015/07/26 17:21:55 martin Exp $	*/
 /*-
  * Copyright (C) 2006,2007 Jason Evans <jasone@FreeBSD.org>.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice(s), this list of conditions and the following disclaimer as
  *    the first lines of this file unmodified other than the possible
  *    addition of one or more copyright notices.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -108,27 +108,27 @@
 /*
  * MALLOC_PRODUCTION disables assertions and statistics gathering.  It also
  * defaults the A and J runtime options to off.  These settings are appropriate
  * for production systems.
  */
 #define MALLOC_PRODUCTION
 #ifndef MALLOC_PRODUCTION
 #  define MALLOC_DEBUG
 #endif
 #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.37 2015/01/20 18:31:25 christos Exp $");
+__RCSID("$NetBSD: jemalloc.c,v 1.38 2015/07/26 17:21:55 martin Exp $");
 #ifdef __FreeBSD__
 #include "libc_private.h"
 #ifdef MALLOC_DEBUG
 #  define _LOCK_DEBUG
 #endif
 #include "spinlock.h"
 #endif
 #include "namespace.h"
 #include <sys/mman.h>
 #include <sys/param.h>
 #ifdef __FreeBSD__
 #include <sys/stddef.h>
 @@ -773,40 +773,78 @@ static size_t		base_mapped;
  */
 /*
  * Arenas that are used to service external requests.  Not all elements of the
  * arenas array are necessarily used; arenas are created lazily as needed.
  */
 static arena_t		**arenas;
 static unsigned		narenas;
 static unsigned		next_arena;
 #ifdef _REENTRANT
 static malloc_mutex_t	arenas_mtx; /* Protects arenas initialization. */
 #endif
 #ifndef NO_TLS
 /*
  * Map of pthread_self() --> arenas[???], used for selecting an arena to use
  * for allocations.
  */
-static __thread arena_t	*arenas_map;
+#ifndef NO_TLS
-#define	get_arenas_map()	(arenas_map)
+static __thread arena_t	**arenas_map;
 #define	set_arenas_map(x)	(arenas_map = x)
 #else
-#ifdef _REENTRANT
+static arena_t	**arenas_map;
 static thread_key_t arenas_map_key;
 #endif
 #define	get_arenas_map()	thr_getspecific(arenas_map_key)
-#define	set_arenas_map(x)	thr_setspecific(arenas_map_key, x)
+#if !defined(NO_TLS) || !defined(_REENTRANT)
 # define	get_arenas_map()	(arenas_map)
 # define	set_arenas_map(x)	(arenas_map = x)
 #else
 static thread_key_t arenas_map_key = -1;
 static inline arena_t **
 get_arenas_map(void)
+{
 	if (!__isthreaded)
 		return arenas_map;
 	if (arenas_map_key == -1) {
 		(void)thr_keycreate(&arenas_map_key, NULL);
 		if (arenas_map != NULL) {
 			thr_setspecific(arenas_map_key, arenas_map);
 			arenas_map = NULL;
+		}
+	}
 	return thr_getspecific(arenas_map_key);
+}
 static __inline void
 set_arenas_map(arena_t **a)
+{
 	if (!__isthreaded) {
 		arenas_map = a;
 		return;
+	}
 	if (arenas_map_key == -1) {
 		(void)thr_keycreate(&arenas_map_key, NULL);
 		if (arenas_map != NULL) {
 			_DIAGASSERT(arenas_map == a);
 			arenas_map = NULL;
+		}
+	}
 	thr_setspecific(arenas_map_key, a);
+}
 #endif
 #ifdef MALLOC_STATS
 /* Chunk statistics. */
 static chunk_stats_t	stats_chunks;
 #endif
 /*******************************/
 /*
  * Runtime configuration options.
  */
 const char	*_malloc_options;
 @@ -3644,31 +3682,26 @@ malloc_init_hard(void)
 	base_pages_alloc(0);
 #endif
 	base_chunk_nodes = NULL;
 	malloc_mutex_init(&base_mtx);
 	if (ncpus > 1) {
 		/*
 		 * For SMP systems, create four times as many arenas as there
 		 * are CPUs by default.
 		 */
 		opt_narenas_lshift += 2;
+	}
 #ifdef NO_TLS
 	/* Initialize arena key. */
 	(void)thr_keycreate(&arenas_map_key, NULL);
 #endif
 	/* Determine how many arenas to use. */
 	narenas = ncpus;
 	if (opt_narenas_lshift > 0) {
 		if ((narenas << opt_narenas_lshift) > narenas)
 			narenas <<= opt_narenas_lshift;
 		/*
 		 * Make sure not to exceed the limits of what base_malloc()
 		 * can handle.
 		 */
 		if (narenas * sizeof(arena_t *) > chunksize)
 			narenas = (unsigned)(chunksize / sizeof(arena_t *));
 	} else if (opt_narenas_lshift < 0) {
 		if ((narenas << opt_narenas_lshift) < narenas)