From a3d0ab47a6d224a4adede2b03f4d3bd623d1822d Mon Sep 17 00:00:00 2001 From: Jason Evans Date: Fri, 27 Jan 2006 04:42:10 +0000 Subject: [PATCH] Add NO_MALLOC_EXTRAS, so that various extra features that can cause performance degradation can be disabled via something like the following in /etc/malloc.conf: CFLAGS+=-DNO_MALLOC_EXTRAS Suggested by: deischen --- lib/libc/stdlib/malloc.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 237c36fcc383..985117869a0e 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -133,7 +133,16 @@ /******************************************************************************/ -#define MALLOC_DEBUG +/* + * In order to disable various extra features that may have negative + * performance impacts, (assertions, expanded statistics, redzones), define + * NO_MALLOC_EXTRAS. + */ +/* #define NO_MALLOC_EXTRAS */ + +#ifndef NO_MALLOC_EXTRAS +# define MALLOC_DEBUG +#endif #include __FBSDID("$FreeBSD$"); @@ -176,12 +185,16 @@ __FBSDID("$FreeBSD$"); * Calculate statistics that can be used to get an idea of how well caching is * working. */ -#define MALLOC_STATS +#ifndef NO_MALLOC_EXTRAS +# define MALLOC_STATS +#endif /* * Include redzones before/after every region, and check for buffer overflows. */ -#define MALLOC_REDZONES +#ifndef NO_MALLOC_EXTRAS +# define MALLOC_REDZONES +#endif #ifdef MALLOC_REDZONES # define MALLOC_RED_2POW 4 # define MALLOC_RED ((size_t)(1 << MALLOC_RED_2POW))