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 860254 - Part 1: #define MALLOC_FILL but keep the options const-false. r=glandium

Browse Source
This commit is contained in:
David Major 2014-02-13 20:10:35 -05:00
parent aa657811d3
commit 9989920680
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
memory/mozjemalloc/jemalloc.c
View File

@ -164,6 +164,9 @@
*/
#define MALLOC_STATS
/* Memory filling (junk/zero). */
#define MALLOC_FILL
#ifndef MALLOC_PRODUCTION
/*
* MALLOC_DEBUG enables assertions and other sanity checks, and disables
@ -171,9 +174,6 @@
*/
# define MALLOC_DEBUG
/* Memory filling (junk/zero). */
# define MALLOC_FILL
/* Allocation tracing. */
# ifndef MOZ_MEMORY_WINDOWS
# define MALLOC_UTRACE
@ -1287,13 +1287,16 @@ const char *_malloc_options = MOZ_MALLOC_OPTIONS;
static bool opt_abort = true;
#ifdef MALLOC_FILL
static bool opt_junk = true;
static bool opt_zero = false;
#endif
#else
static bool opt_abort = false;
#ifdef MALLOC_FILL
static bool opt_junk = false;
static const bool opt_junk = false;
static const bool opt_zero = false;
#endif
#endif
static size_t opt_dirty_max = DIRTY_MAX_DEFAULT;
#ifdef MALLOC_BALANCE
static uint64_t opt_balance_threshold = BALANCE_THRESHOLD_DEFAULT;
@ -1320,9 +1323,6 @@ static bool opt_sysv = false;
#ifdef MALLOC_XMALLOC
static bool opt_xmalloc = false;
#endif
#ifdef MALLOC_FILL
static bool opt_zero = false;
#endif
static int opt_narenas_lshift = 0;
#ifdef MALLOC_UTRACE
@ -5760,6 +5760,7 @@ MALLOC_OUT:
opt_dirty_max <<= 1;
break;
#ifdef MALLOC_FILL
#ifndef MALLOC_PRODUCTION
case 'j':
opt_junk = false;
break;
@ -5767,6 +5768,7 @@ MALLOC_OUT:
opt_junk = true;
break;
#endif
#endif
#ifndef MALLOC_STATIC_SIZES
case 'k':
/*
@ -5851,12 +5853,14 @@ MALLOC_OUT:
break;
#endif
#ifdef MALLOC_FILL
#ifndef MALLOC_PRODUCTION
case 'z':
opt_zero = false;
break;
case 'Z':
opt_zero = true;
break;
#endif
#endif
default: {
char cbuf[2];