diff options
| author | Qi Wang <interwq@gwu.edu> | 2017-05-30 20:17:10 (GMT) |
|---|---|---|
| committer | Qi Wang <interwq@gmail.com> | 2017-05-31 00:37:35 (GMT) |
| commit | 7578b0e929f3380ba1713bd77a38c402a90f3b27 (patch) | |
| tree | 5b55c778c4b19e7e44659f5b5adbd84074e4f9ac | |
| parent | 685c97fc433dad4b872639b08aaf074a8db3fdb1 (diff) | |
| download | jemalloc-7578b0e929f3380ba1713bd77a38c402a90f3b27.zip jemalloc-7578b0e929f3380ba1713bd77a38c402a90f3b27.tar.gz jemalloc-7578b0e929f3380ba1713bd77a38c402a90f3b27.tar.bz2 | |
Explicitly say so when aborting on opt_abort_conf.
| -rw-r--r-- | src/jemalloc.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/jemalloc.c b/src/jemalloc.c index 5e3072b..ed22a25 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -878,13 +878,21 @@ malloc_conf_next(char const **opts_p, char const **k_p, size_t *klen_p, } static void +malloc_abort_invalid_conf(void) { + assert(opt_abort_conf); + malloc_printf("<jemalloc>: Abort (abort_conf:true) on invalid conf " + "value (see above).\n"); + abort(); +} + +static void malloc_conf_error(const char *msg, const char *k, size_t klen, const char *v, size_t vlen) { malloc_printf("<jemalloc>: %s: %.*s:%.*s\n", msg, (int)klen, k, (int)vlen, v); had_conf_error = true; if (opt_abort_conf) { - abort(); + malloc_abort_invalid_conf(); } } @@ -1086,7 +1094,7 @@ malloc_conf_init(void) { CONF_HANDLE_BOOL(opt_abort, "abort") CONF_HANDLE_BOOL(opt_abort_conf, "abort_conf") if (opt_abort_conf && had_conf_error) { - abort(); + malloc_abort_invalid_conf(); } CONF_HANDLE_BOOL(opt_retain, "retain") if (strncmp("dss", k, klen) == 0) { |