Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 699101 - Warn when NO_MAC_JEMALLOC is set on i386 machines, because it doesn't work there. r=khuey

Browse Source
This commit is contained in:
Justin Lebar 2011-11-04 11:41:53 -04:00
parent 392e68970f
commit 4199c112c7
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
memory/jemalloc/jemalloc.c
View File

@ -6073,8 +6073,13 @@ MALLOC_OUT:
default_zone->version == LION_MALLOC_ZONE_T_VERSION);
/* Allow us dynamically turn off jemalloc for testing. */
if (getenv("NO_MAC_JEMALLOC"))
if (getenv("NO_MAC_JEMALLOC")) {
osx_use_jemalloc = false;
#ifdef __i386__
malloc_printf("Warning: NO_MAC_JEMALLOC has no effect on "
"i386 machines (such as this one).\n");
#endif
}
if (osx_use_jemalloc) {
/*
@ -6175,8 +6180,11 @@ wrap(strdup)(const char *src) {
* allocators, we need to call the OSX allocators from the functions below,
* when osx_use_jemalloc is not (dynamically) set.
*
* memalign is unavailable on Leopard, so we can't dynamically do this there.
* However, we don't use jemalloc on Leopard, so we can ignore this.
* Note that we assume jemalloc is enabled on i386. This is safe because the
* only i386 versions of MacOS are 10.5 and 10.6, which we support. We have to
* do this because madvise isn't in the malloc zone struct for 10.5.
*
* This means that NO_MAC_JEMALLOC doesn't work on i386.
*/
#if defined(MOZ_MEMORY_DARWIN) && !defined(__i386__)
#define DARWIN_ONLY(A) if (!osx_use_jemalloc) { A; }