Bug 1057754 (follow-up) - Allow Valgrind + jemalloc to be combined, because it makes sense when running Cachegrind. r=me.

This commit is contained in:
Nicholas Nethercote 2014-08-25 20:38:29 -07:00
parent 015fc70f98
commit ee0e0c98ea

View File

@ -193,10 +193,6 @@
*/
#define MALLOC_VALIDATE
#ifdef MOZ_VALGRIND
# include <valgrind/valgrind.h>
#endif
/*
* MALLOC_BALANCE enables monitoring of arena lock contention and dynamically
* re-balances arena load if exponentially averaged contention exceeds a
@ -3379,15 +3375,6 @@ arena_chunk_init(arena_t *arena, arena_chunk_t *chunk)
arena_run_t *run;
size_t i;
#ifdef MOZ_VALGRIND
if (RUNNING_ON_VALGRIND) {
fprintf(stderr, "ERROR: Cannot run Valgrind with jemalloc enabled.\n");
fprintf(stderr, "Please build with --disable-jemalloc, or run Valgrind with\n");
fprintf(stderr, "--soname-synonyms=somalloc=NONE.\n");
jemalloc_crash();
}
#endif
#ifdef MALLOC_STATS
arena->stats.mapped += chunksize;
#endif