project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explicitly say so when aborting on opt_abort_conf.

Browse Source
This commit is contained in:
Qi Wang 2017-05-30 13:17:10 -07:00 committed by Qi Wang
parent 685c97fc43
commit 7578b0e929
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/jemalloc.c
View File

@ -877,6 +877,14 @@ malloc_conf_next(char const **opts_p, char const **k_p, size_t *klen_p,
return false; return false;
} }
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 static void
malloc_conf_error(const char *msg, const char *k, size_t klen, const char *v, malloc_conf_error(const char *msg, const char *k, size_t klen, const char *v,
size_t vlen) { size_t vlen) {
@ -884,7 +892,7 @@ malloc_conf_error(const char *msg, const char *k, size_t klen, const char *v,
(int)vlen, v); (int)vlen, v);
had_conf_error = true; had_conf_error = true;
if (opt_abort_conf) { 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, "abort")
CONF_HANDLE_BOOL(opt_abort_conf, "abort_conf") CONF_HANDLE_BOOL(opt_abort_conf, "abort_conf")
if (opt_abort_conf && had_conf_error) { if (opt_abort_conf && had_conf_error) {
abort(); malloc_abort_invalid_conf();
} }
CONF_HANDLE_BOOL(opt_retain, "retain") CONF_HANDLE_BOOL(opt_retain, "retain")
if (strncmp("dss", k, klen) == 0) { if (strncmp("dss", k, klen) == 0) {