diff options
| author | Jason Evans <jasone@canonware.com> | 2013-01-22 20:14:45 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2013-01-22 20:14:45 (GMT) |
| commit | ba175a2bfb236d79404012d9b5bb6e9b3c8be8dd (patch) | |
| tree | 213573f39ae229a9a1338f230f0d6d9ecd5664ea /src | |
| parent | ae03bf6a57f0dd6a009288fa6477a300cabf6d5e (diff) | |
| download | jemalloc-ba175a2bfb236d79404012d9b5bb6e9b3c8be8dd.zip jemalloc-ba175a2bfb236d79404012d9b5bb6e9b3c8be8dd.tar.gz jemalloc-ba175a2bfb236d79404012d9b5bb6e9b3c8be8dd.tar.bz2 | |
Use config_* instead of JEMALLOC_*.
Convert a couple of stragglers from JEMALLOC_* to use config_*.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ckh.c | 5 | ||||
| -rw-r--r-- | src/jemalloc.c | 13 |
2 files changed, 4 insertions, 14 deletions
@@ -418,9 +418,8 @@ ckh_delete(ckh_t *ckh) #endif idalloc(ckh->tab); -#ifdef JEMALLOC_DEBUG - memset(ckh, 0x5a, sizeof(ckh_t)); -#endif + if (config_debug) + memset(ckh, 0x5a, sizeof(ckh_t)); } size_t diff --git a/src/jemalloc.c b/src/jemalloc.c index 58e18df..2d56e4a 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -10,17 +10,8 @@ malloc_tsd_data(, thread_allocated, thread_allocated_t, /* Runtime configuration options. */ const char *je_malloc_conf; -#ifdef JEMALLOC_DEBUG -bool opt_abort = true; -# ifdef JEMALLOC_FILL -bool opt_junk = true; -# else -bool opt_junk = false; -# endif -#else -bool opt_abort = false; -bool opt_junk = false; -#endif +bool opt_abort = config_debug; +bool opt_junk = (config_debug && config_fill); size_t opt_quarantine = ZU(0); bool opt_redzone = false; bool opt_utrace = false; |