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

Bug 1365460 - Remove the inline extra malloc options. r=njn

Browse Source 
Those options, complementing the MALLOC_OPTIONS environment variable,
were always empty since the removal of b2g.

--HG--
extra : rebase_source : 0e34cfce0b537ebb8ed3902bd46180dc205cb0e4
This commit is contained in:
Mike Hommey 2017-05-18 10:06:29 +09:00
parent 937023c28a
commit f3762790b7
1 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
memory/mozjemalloc/mozjemalloc.cpp
View File

@ -141,18 +141,6 @@
# define MALLOC_PRODUCTION
#endif
/*
* Pass this set of options to jemalloc as its default. It does not override
* the options passed via the MALLOC_OPTIONS environment variable but is
* applied in addition to them.
*/
#ifdef MOZ_WIDGET_GONK
/* Reduce the amount of unused dirty pages to 1MiB on B2G */
# define MOZ_MALLOC_OPTIONS "ff"
#else
# define MOZ_MALLOC_OPTIONS ""
#endif
#ifndef MALLOC_PRODUCTION
/*
* MALLOC_DEBUG enables assertions and other sanity checks, and disables
@ -1075,8 +1063,6 @@ static __thread arena_t *arenas_map;
/*
* Runtime configuration options.
*/
const char *_malloc_options = MOZ_MALLOC_OPTIONS;
const uint8_t kAllocJunk = 0xe4;
const uint8_t kAllocPoison = 0xe5;
@ -4760,7 +4746,7 @@ malloc_init_hard(void)
pagesize_2pow = ffs((int)result) - 1;
#endif
for (i = 0; i < 3; i++) {
for (i = 0; i < 2; i++) {
unsigned j;
/* Get runtime configuration. */
@ -4796,19 +4782,6 @@ malloc_init_hard(void)
opts = buf;
}
break;
case 2:
if (_malloc_options != NULL) {
/*
* Use options that were compiled into the
* program.
*/
opts = _malloc_options;
} else {
/* No configuration specified. */
buf[0] = '\0';
opts = buf;
}
break;
default:
/* NOTREACHED */
buf[0] = '\0';