summaryrefslogtreecommitdiff
path: root/memory
diff options
context:
space:
mode:
authorMike Hommey <mh+mozilla@glandium.org>2018-01-31 17:18:01 +0900
committerwolfbeast <mcwerewolf@gmail.com>2018-03-14 10:56:20 +0100
commitf56791f643f8fa547805d99ec938b135d665a9c6 (patch)
tree243c8ed3a8875a7a4c8013f4be1e095374105917 /memory
parentd9ef671b04f43a30f3fcd2db4e351a3cbd811f68 (diff)
downloaduxp-f56791f643f8fa547805d99ec938b135d665a9c6.tar.gz
Bug 1424709 - Force disable the OSX system "nano allocator". r=spohl, a=RyanVM
We're not actually using it, and it messes up with the zone allocator in mozjemalloc after fork(). See the lengthy analysis in https://bugzilla.mozilla.org/show_bug.cgi?id=1424709#c34 and following. --HG-- extra : rebase_source : b191048290a907cc7668ad7ab6369ef8661f31dc extra : intermediate-source : 45c5d467a46077dcc3ccd59feafd0c2784432fef extra : source : bf1efa161edb20a83fe8db2f96c51f4e66880153
Diffstat (limited to 'memory')
-rw-r--r--memory/build/replace_malloc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/memory/build/replace_malloc.c b/memory/build/replace_malloc.c
index 88dfde33c4..26dd8c2d6b 100644
--- a/memory/build/replace_malloc.c
+++ b/memory/build/replace_malloc.c
@@ -513,6 +513,12 @@ register_zone(void)
*/
malloc_zone_t *purgeable_zone = malloc_default_purgeable_zone();
+ // There is a problem related to the above with the system nano zone, which
+ // is hard to work around from here, and that is instead worked around by
+ // disabling the nano zone through an environment variable
+ // (MallocNanoZone=0). In Firefox, we do that through
+ // browser/app/macbuild/Contents/Info.plist.in.
+
/* Register the custom zone. At this point it won't be the default. */
malloc_zone_register(&zone);