lihao/jemalloc
1
0
Fork 0
mirror of https://github.com/jemalloc/jemalloc.git synced 2026-07-23 13:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve zone support for OSX

Browse Source 
I tested a build from 10.7 run on 10.7 and 10.6, and a build from 10.6
run on 10.6.  The AC_COMPILE_IFELSE limbo is to avoid running a program
during configure, which presumably makes it work when cross compiling
for iOS.
This commit is contained in:
Mike Hommey
2012-03-20 18:01:38 +01:00
committed by Jason Evans
parent f4d0fc310e
commit 154829d256
3 changed files with 63 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/jemalloc.c
View File

@@ -747,15 +747,23 @@ malloc_init_hard(void)
arenas[0] = init_arenas[0];
#ifdef JEMALLOC_ZONE
/* Register the custom zone. */
malloc_zone_register(create_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);
/*
* Convert the default szone to an "overlay zone" that is capable of
* deallocating szone-allocated objects, but allocating new objects
* from jemalloc.
* 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.
*/
szone2ozone(malloc_default_zone());
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;