From 02b231205e802a7c4f33899a569adcb1312a85d5 Mon Sep 17 00:00:00 2001
From: Jason Evans <je@fb.com>
Date: Thu, 5 Apr 2012 11:06:23 -0700
Subject: [PATCH] Fix threaded initialization and enable it on Linux.

Reported by Mike Hommey.
---
 configure.ac   | 1 +
 src/jemalloc.c | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8e6a3099..16f03784 100644
--- a/configure.ac
+++ b/configure.ac
@@ -228,6 +228,7 @@ case "${host}" in
 	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	abi="elf"
 	AC_DEFINE([JEMALLOC_PURGE_MADVISE_DONTNEED], [ ])
+	AC_DEFINE([JEMALLOC_THREADED_INIT], [ ])
 	RPATH="-Wl,-rpath,"
 	;;
   *-*-netbsd*)
diff --git a/src/jemalloc.c b/src/jemalloc.c
index 690cf082..a531a216 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -36,13 +36,15 @@ static bool		malloc_initialized = false;
 
 #ifdef JEMALLOC_THREADED_INIT
 /* Used to let the initializing thread recursively allocate. */
-static pthread_t	malloc_initializer = (unsigned long)0;
+#  define NO_INITIALIZER	((unsigned long)0)
 #  define INITIALIZER		pthread_self()
 #  define IS_INITIALIZER	(malloc_initializer == pthread_self())
+static pthread_t		malloc_initializer = NO_INITIALIZER;
 #else
-static bool		malloc_initializer = false;
+#  define NO_INITIALIZER	false
 #  define INITIALIZER		true
 #  define IS_INITIALIZER	malloc_initializer
+static bool			malloc_initializer = NO_INITIALIZER;
 #endif
 
 /* Used to avoid initialization races. */
@@ -531,7 +533,7 @@ malloc_init_hard(void)
 		return (false);
 	}
 #ifdef JEMALLOC_THREADED_INIT
-	if (IS_INITIALIZER == false) {
+	if (malloc_initializer != NO_INITIALIZER && IS_INITIALIZER == false) {
 		/* Busy-wait until the initializing thread completes. */
 		do {
 			malloc_mutex_unlock(&init_lock);