project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't register jemalloc's zone allocator if something else already replaced the system default zone

Browse Source
This commit is contained in:
Mike Hommey 2012-10-23 08:42:48 +02:00 committed by Jason Evans
parent e3d13060c8
commit 847ff223de
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/zone.c
View File

@ -171,6 +171,16 @@ void
register_zone(void) register_zone(void)
{ {
/*
* If something else replaced the system default zone allocator, don't
* register jemalloc's.
*/
malloc_zone_t *default_zone = malloc_default_zone();
if (!default_zone->zone_name ||
strcmp(default_zone->zone_name, "DefaultMallocZone") != 0) {
return;
}
zone.size = (void *)zone_size; zone.size = (void *)zone_size;
zone.malloc = (void *)zone_malloc; zone.malloc = (void *)zone_malloc;
zone.calloc = (void *)zone_calloc; zone.calloc = (void *)zone_calloc;
@ -241,7 +251,7 @@ register_zone(void)
* then becomes the default. * then becomes the default.
*/ */
do { do {
malloc_zone_t *default_zone = malloc_default_zone(); default_zone = malloc_default_zone();
malloc_zone_unregister(default_zone); malloc_zone_unregister(default_zone);
malloc_zone_register(default_zone); malloc_zone_register(default_zone);
} while (malloc_default_zone() != &zone); } while (malloc_default_zone() != &zone);