mirror of
https://github.com/jemalloc/jemalloc.git
synced 2026-07-08 06:47:18 +03:00
Remove experimental_hpa_max_purge_nhp option
It is unused and no longer needed: hpa_dirty_mult, hpa_purge_threshold, hpa_min_purge_interval_ms, and hpa_min_purge_delay_ms now provide finer control over the purge rate.
This commit is contained in:
parent
db15a39d75
commit
43a8adc187
12 changed files with 2 additions and 118 deletions
|
|
@ -875,10 +875,6 @@ malloc_conf_init_helper(sc_data_t *sc_data, unsigned bin_shard_sizes[SC_NBINS],
|
|||
"hpa_min_purge_interval_ms", 0, 0,
|
||||
CONF_DONT_CHECK_MIN, CONF_DONT_CHECK_MAX, false);
|
||||
|
||||
CONF_HANDLE_SSIZE_T(
|
||||
opt_hpa_opts.experimental_max_purge_nhp,
|
||||
"experimental_hpa_max_purge_nhp", -1, SSIZE_MAX);
|
||||
|
||||
/*
|
||||
* Accept either a ratio-based or an exact purge
|
||||
* threshold.
|
||||
|
|
|
|||
|
|
@ -139,7 +139,6 @@ CTL_PROTO(opt_hpa_hugification_threshold)
|
|||
CTL_PROTO(opt_hpa_hugify_delay_ms)
|
||||
CTL_PROTO(opt_hpa_hugify_sync)
|
||||
CTL_PROTO(opt_hpa_min_purge_interval_ms)
|
||||
CTL_PROTO(opt_experimental_hpa_max_purge_nhp)
|
||||
CTL_PROTO(opt_hpa_purge_threshold)
|
||||
CTL_PROTO(opt_hpa_min_purge_delay_ms)
|
||||
CTL_PROTO(opt_hpa_hugify_style)
|
||||
|
|
@ -519,8 +518,6 @@ static const ctl_named_node_t opt_node[] = {{NAME("abort"), CTL(opt_abort)},
|
|||
{NAME("hpa_hugify_delay_ms"), CTL(opt_hpa_hugify_delay_ms)},
|
||||
{NAME("hpa_hugify_sync"), CTL(opt_hpa_hugify_sync)},
|
||||
{NAME("hpa_min_purge_interval_ms"), CTL(opt_hpa_min_purge_interval_ms)},
|
||||
{NAME("experimental_hpa_max_purge_nhp"),
|
||||
CTL(opt_experimental_hpa_max_purge_nhp)},
|
||||
{NAME("hpa_purge_threshold"), CTL(opt_hpa_purge_threshold)},
|
||||
{NAME("hpa_min_purge_delay_ms"), CTL(opt_hpa_min_purge_delay_ms)},
|
||||
{NAME("hpa_hugify_style"), CTL(opt_hpa_hugify_style)},
|
||||
|
|
@ -2241,8 +2238,6 @@ CTL_RO_NL_GEN(opt_hpa_hugify_delay_ms, opt_hpa_opts.hugify_delay_ms, uint64_t)
|
|||
CTL_RO_NL_GEN(opt_hpa_hugify_sync, opt_hpa_opts.hugify_sync, bool)
|
||||
CTL_RO_NL_GEN(
|
||||
opt_hpa_min_purge_interval_ms, opt_hpa_opts.min_purge_interval_ms, uint64_t)
|
||||
CTL_RO_NL_GEN(opt_experimental_hpa_max_purge_nhp,
|
||||
opt_hpa_opts.experimental_max_purge_nhp, ssize_t)
|
||||
CTL_RO_NL_GEN(opt_hpa_purge_threshold, opt_hpa_opts.purge_threshold, size_t)
|
||||
CTL_RO_NL_GEN(
|
||||
opt_hpa_min_purge_delay_ms, opt_hpa_opts.min_purge_delay_ms, uint64_t)
|
||||
|
|
|
|||
16
src/hpa.c
16
src/hpa.c
|
|
@ -634,22 +634,8 @@ hpa_shard_maybe_do_deferred_work(
|
|||
* too frequently.
|
||||
*/
|
||||
if (hpa_min_purge_interval_passed(tsdn, shard)) {
|
||||
size_t max_purges = max_ops;
|
||||
/*
|
||||
* Limit number of hugepages (slabs) to purge.
|
||||
* When experimental_max_purge_nhp option is used, there is no
|
||||
* guarantee we'll always respect dirty_mult option. Option
|
||||
* experimental_max_purge_nhp provides a way to configure same
|
||||
* behavior as was possible before, with buggy implementation
|
||||
* of purging algorithm.
|
||||
*/
|
||||
ssize_t max_purge_nhp = shard->opts.experimental_max_purge_nhp;
|
||||
if (max_purge_nhp != -1 && max_purges > (size_t)max_purge_nhp) {
|
||||
max_purges = max_purge_nhp;
|
||||
}
|
||||
|
||||
malloc_mutex_assert_owner(tsdn, &shard->mtx);
|
||||
nops += hpa_purge(tsdn, shard, max_purges);
|
||||
nops += hpa_purge(tsdn, shard, max_ops);
|
||||
malloc_mutex_assert_owner(tsdn, &shard->mtx);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1774,7 +1774,6 @@ stats_general_print(emitter_t *emitter) {
|
|||
OPT_WRITE_UINT64("hpa_hugify_delay_ms")
|
||||
OPT_WRITE_BOOL("hpa_hugify_sync")
|
||||
OPT_WRITE_UINT64("hpa_min_purge_interval_ms")
|
||||
OPT_WRITE_SSIZE_T("experimental_hpa_max_purge_nhp")
|
||||
if (je_mallctl("opt.hpa_dirty_mult", (void *)&u32v, &u32sz, NULL, 0)
|
||||
== 0) {
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue