diff options
| author | Qi Wang <interwq@gwu.edu> | 2022-01-26 14:05:04 -0800 |
|---|---|---|
| committer | Qi Wang <interwq@gmail.com> | 2022-01-26 17:17:48 -0800 |
| commit | 8c59c44ffa83bab0f73d5cc8f7d0bbc8d649220b (patch) | |
| tree | fb990c0d396281e811c1b563080ce6c70c7267b5 /src | |
| parent | efc539c040cf11b19ffc8af29a8cc3e5c3609092 (diff) | |
| download | jemalloc-8c59c44ffa83bab0f73d5cc8f7d0bbc8d649220b.tar.gz | |
Add a dependency checking step at the end of malloc_conf_init.
Currently only prof_leak_error and prof_final are checked.
Diffstat (limited to 'src')
| -rw-r--r-- | src/jemalloc.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/src/jemalloc.c b/src/jemalloc.c index 85c38dd6..364dc57f 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -1578,26 +1578,8 @@ malloc_conf_init_helper(sc_data_t *sc_data, unsigned bin_shard_sizes[SC_NBINS], CONF_HANDLE_BOOL(opt_prof_gdump, "prof_gdump") CONF_HANDLE_BOOL(opt_prof_final, "prof_final") CONF_HANDLE_BOOL(opt_prof_leak, "prof_leak") - if (CONF_MATCH("prof_leak_error")) { - if (CONF_MATCH_VALUE("true")) { - if (!opt_prof_final) { - CONF_ERROR( - "prof_leak_error is" - " not allowed" - " without" - " prof_final", - k, klen, v, vlen); - } else { - opt_prof_leak = true; - opt_prof_leak_error = - true; - } - } else if (!CONF_MATCH_VALUE("false")) { - CONF_ERROR("Invalid conf value", - k, klen, v, vlen); - } - CONF_CONTINUE; - } + CONF_HANDLE_BOOL(opt_prof_leak_error, + "prof_leak_error") CONF_HANDLE_BOOL(opt_prof_log, "prof_log") CONF_HANDLE_SSIZE_T(opt_prof_recent_alloc_max, "prof_recent_alloc_max", -1, SSIZE_MAX) @@ -1742,6 +1724,17 @@ malloc_conf_init_helper(sc_data_t *sc_data, unsigned bin_shard_sizes[SC_NBINS], atomic_store_b(&log_init_done, true, ATOMIC_RELEASE); } +static bool +malloc_conf_init_check_deps(void) { + if (opt_prof_leak_error && !opt_prof_final) { + malloc_printf("<jemalloc>: prof_leak_error is set w/o " + "prof_final.\n"); + return true; + } + + return false; +} + static void malloc_conf_init(sc_data_t *sc_data, unsigned bin_shard_sizes[SC_NBINS]) { const char *opts_cache[MALLOC_CONF_NSOURCES] = {NULL, NULL, NULL, NULL, @@ -1752,6 +1745,12 @@ malloc_conf_init(sc_data_t *sc_data, unsigned bin_shard_sizes[SC_NBINS]) { malloc_conf_init_helper(NULL, NULL, true, opts_cache, buf); malloc_conf_init_helper(sc_data, bin_shard_sizes, false, opts_cache, NULL); + if (malloc_conf_init_check_deps()) { + /* check_deps does warning msg only; abort below if needed. */ + if (opt_abort_conf) { + malloc_abort_invalid_conf(); + } + } } #undef MALLOC_CONF_NSOURCES |