Skip to content
This repository has been archived by the owner on Feb 5, 2019. It is now read-only.

Commit

Permalink
Change how the default zone is found
Browse files Browse the repository at this point in the history
On OSX 10.12, malloc_default_zone returns a special zone that is not
present in the list of registered zones. That zone uses a "lite zone"
if one is present (apparently enabled when malloc stack logging is
enabled), or the first registered zone otherwise. In practice this
means unless malloc stack logging is enabled, the first registered
zone is the default.

So get the list of zones to get the first one, instead of relying on
malloc_default_zone.
  • Loading branch information
glandium committed Jul 8, 2016
1 parent 9355bd6 commit e058ca6
Showing 1 changed file with 29 additions and 2 deletions.
31 changes: 29 additions & 2 deletions src/zone.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,33 @@ zone_force_unlock(malloc_zone_t *zone)
jemalloc_postfork_parent();
}

static malloc_zone_t *get_default_zone()
{
malloc_zone_t **zones = NULL;
unsigned int num_zones = 0;

/*
* On OSX 10.12, malloc_default_zone returns a special zone that is not
* present in the list of registered zones. That zone uses a "lite zone"
* if one is present (apparently enabled when malloc stack logging is
* enabled), or the first registered zone otherwise. In practice this
* means unless malloc stack logging is enabled, the first registered
* zone is the default.
* So get the list of zones to get the first one, instead of relying on
* malloc_default_zone.
*/
if (KERN_SUCCESS != malloc_get_all_zones(0, NULL, (vm_address_t**) &zones,
&num_zones)) {
/* Reset the value in case the failure happened after it was set. */
num_zones = 0;
}

if (num_zones)
return zones[0];

return malloc_default_zone();
}

JEMALLOC_ATTR(constructor)
void
register_zone(void)
Expand All @@ -177,7 +204,7 @@ 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();
malloc_zone_t *default_zone = get_default_zone();
malloc_zone_t *purgeable_zone = NULL;
if (!default_zone->zone_name ||
strcmp(default_zone->zone_name, "DefaultMallocZone") != 0) {
Expand Down Expand Up @@ -272,6 +299,6 @@ register_zone(void)
malloc_zone_register(purgeable_zone);
}

default_zone = malloc_default_zone();
default_zone = get_default_zone();
} while (default_zone != &zone);
}

0 comments on commit e058ca6

Please sign in to comment.