From 71a93b8725fb52ae393ab88e2fccd5afa84c66a0 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh@glandium.org>
Date: Tue, 27 Mar 2012 14:20:12 +0200
Subject: [PATCH] Move zone registration to zone.c

---
 include/jemalloc/internal/private_namespace.h |  2 +-
 include/jemalloc/internal/zone.h              |  3 +--
 src/jemalloc.c                                | 24 ++-----------------
 src/zone.c                                    | 22 ++++++++++++++---
 4 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/include/jemalloc/internal/private_namespace.h b/include/jemalloc/internal/private_namespace.h
index 7103e680..ed34e328 100644
--- a/include/jemalloc/internal/private_namespace.h
+++ b/include/jemalloc/internal/private_namespace.h
@@ -82,7 +82,6 @@
 #define	ckh_string_keycomp JEMALLOC_N(ckh_string_keycomp)
 #define	ckh_try_bucket_insert JEMALLOC_N(ckh_try_bucket_insert)
 #define	ckh_try_insert JEMALLOC_N(ckh_try_insert)
-#define	create_zone JEMALLOC_N(create_zone)
 #define	ctl_boot JEMALLOC_N(ctl_boot)
 #define	ctl_bymib JEMALLOC_N(ctl_bymib)
 #define	ctl_byname JEMALLOC_N(ctl_byname)
@@ -195,6 +194,7 @@
 #define	prof_tdata_init JEMALLOC_N(prof_tdata_init)
 #define	prof_tdata_tls JEMALLOC_N(prof_tdata_tls)
 #define	pthread_create JEMALLOC_N(pthread_create)
+#define	register_zone JEMALLOC_N(register_zone)
 #define	rtree_get JEMALLOC_N(rtree_get)
 #define	rtree_get_locked JEMALLOC_N(rtree_get_locked)
 #define	rtree_new JEMALLOC_N(rtree_new)
diff --git a/include/jemalloc/internal/zone.h b/include/jemalloc/internal/zone.h
index 859b529d..9eb4252f 100644
--- a/include/jemalloc/internal/zone.h
+++ b/include/jemalloc/internal/zone.h
@@ -12,8 +12,7 @@
 /******************************************************************************/
 #ifdef JEMALLOC_H_EXTERNS
 
-malloc_zone_t *create_zone(void);
-void	szone2ozone(malloc_zone_t *zone);
+void register_zone(void);
 
 #endif /* JEMALLOC_H_EXTERNS */
 /******************************************************************************/
diff --git a/src/jemalloc.c b/src/jemalloc.c
index 9eae1372..908485a7 100644
--- a/src/jemalloc.c
+++ b/src/jemalloc.c
@@ -712,26 +712,6 @@ malloc_init_hard(void)
 	/* Copy the pointer to the one arena that was already initialized. */
 	arenas[0] = init_arenas[0];
 
-#ifdef JEMALLOC_ZONE
-	/* Register the custom zone. At this point it won't be the default. */
-	malloc_zone_t *jemalloc_zone = create_zone();
-	malloc_zone_register(jemalloc_zone);
-
-	/*
-	 * Unregister and reregister the default zone. On OSX >= 10.6,
-	 * unregistering takes the last registered zone and places it at the
-	 * location of the specified zone. Unregistering the default zone thus
-	 * makes the last registered one the default. On OSX < 10.6,
-	 * unregistering shifts all registered zones. The first registered zone
-	 * then becomes the default.
-	 */
-	do {
-		malloc_zone_t *default_zone = malloc_default_zone();
-		malloc_zone_unregister(default_zone);
-		malloc_zone_register(default_zone);
-	} while (malloc_default_zone() != jemalloc_zone);
-#endif
-
 	malloc_initialized = true;
 	malloc_mutex_unlock(&init_lock);
 	return (false);
@@ -743,8 +723,8 @@ void
 jemalloc_darwin_init(void)
 {
 
-	if (malloc_init_hard())
-		abort();
+	if (malloc_init_hard() == false)
+		register_zone();
 }
 #endif
 
diff --git a/src/zone.c b/src/zone.c
index d3107f85..4b6c75e4 100644
--- a/src/zone.c
+++ b/src/zone.c
@@ -159,8 +159,8 @@ zone_force_unlock(malloc_zone_t *zone)
 		jemalloc_postfork_parent();
 }
 
-malloc_zone_t *
-create_zone(void)
+void
+register_zone(void)
 {
 
 	zone.size = (void *)zone_size;
@@ -206,5 +206,21 @@ create_zone(void)
 	zone_introspect.enumerate_unavailable_without_blocks = NULL;
 #endif
 #endif
-	return (&zone);
+
+	/* Register the custom zone. At this point it won't be the default. */
+	malloc_zone_register(&zone);
+
+	/*
+	 * Unregister and reregister the default zone. On OSX >= 10.6,
+	 * unregistering takes the last registered zone and places it at the
+	 * location of the specified zone. Unregistering the default zone thus
+	 * makes the last registered one the default. On OSX < 10.6,
+	 * unregistering shifts all registered zones. The first registered zone
+	 * then becomes the default.
+	 */
+	do {
+		malloc_zone_t *default_zone = malloc_default_zone();
+		malloc_zone_unregister(default_zone);
+		malloc_zone_register(default_zone);
+	} while (malloc_default_zone() != &zone);
 }