lihao/jemalloc
1
0
Fork 0
mirror of https://github.com/jemalloc/jemalloc.git synced 2026-07-24 05:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add experimental prefix to hpa_strict_min_purge_interval

Browse Source 
Goal is to make it obvious this option is experimental.
This commit is contained in:
Dmitry Ilvokhin
2024-08-19 10:54:19 -07:00
committed by Qi Wang
parent aaa29003ab
commit c7ccb8d7e9
8 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/jemalloc/internal/hpa_opts.h
View File

@@ -56,7 +56,7 @@ struct hpa_shard_opts_s {
* This is an option to provide backward compatibility for staged rollout of * This is an option to provide backward compatibility for staged rollout of
* purging logic fix. * purging logic fix.
*/ */
bool strict_min_purge_interval; bool experimental_strict_min_purge_interval;
/* /*
* Maximum number of hugepages to purge on each purging attempt. * Maximum number of hugepages to purge on each purging attempt.
@@ -83,7 +83,7 @@ struct hpa_shard_opts_s {
10 * 1000, \ 10 * 1000, \
/* min_purge_interval_ms */ \ /* min_purge_interval_ms */ \
5 * 1000, \ 5 * 1000, \
/* strict_min_purge_interval */ \ /* experimental_strict_min_purge_interval */ \
false, \ false, \
/* experimental_max_purge_nhp */ \ /* experimental_max_purge_nhp */ \
-1 \ -1 \

10
src/ctl.c
View File

@@ -103,7 +103,7 @@ CTL_PROTO(opt_hpa_slab_max_alloc)
CTL_PROTO(opt_hpa_hugification_threshold) CTL_PROTO(opt_hpa_hugification_threshold)
CTL_PROTO(opt_hpa_hugify_delay_ms) CTL_PROTO(opt_hpa_hugify_delay_ms)
CTL_PROTO(opt_hpa_min_purge_interval_ms) CTL_PROTO(opt_hpa_min_purge_interval_ms)
CTL_PROTO(opt_hpa_strict_min_purge_interval) CTL_PROTO(opt_experimental_hpa_strict_min_purge_interval)
CTL_PROTO(opt_experimental_hpa_max_purge_nhp) CTL_PROTO(opt_experimental_hpa_max_purge_nhp)
CTL_PROTO(opt_hpa_dirty_mult) CTL_PROTO(opt_hpa_dirty_mult)
CTL_PROTO(opt_hpa_sec_nshards) CTL_PROTO(opt_hpa_sec_nshards)
@@ -461,8 +461,8 @@ static const ctl_named_node_t opt_node[] = {
CTL(opt_hpa_hugification_threshold)}, CTL(opt_hpa_hugification_threshold)},
{NAME("hpa_hugify_delay_ms"), CTL(opt_hpa_hugify_delay_ms)}, {NAME("hpa_hugify_delay_ms"), CTL(opt_hpa_hugify_delay_ms)},
{NAME("hpa_min_purge_interval_ms"), CTL(opt_hpa_min_purge_interval_ms)}, {NAME("hpa_min_purge_interval_ms"), CTL(opt_hpa_min_purge_interval_ms)},
{NAME("hpa_strict_min_purge_interval"), {NAME("experimental_hpa_strict_min_purge_interval"),
CTL(opt_hpa_strict_min_purge_interval)}, CTL(opt_experimental_hpa_strict_min_purge_interval)},
{NAME("experimental_hpa_max_purge_nhp"), {NAME("experimental_hpa_max_purge_nhp"),
CTL(opt_experimental_hpa_max_purge_nhp)}, CTL(opt_experimental_hpa_max_purge_nhp)},
{NAME("hpa_dirty_mult"), CTL(opt_hpa_dirty_mult)}, {NAME("hpa_dirty_mult"), CTL(opt_hpa_dirty_mult)},
@@ -2199,8 +2199,8 @@ CTL_RO_NL_GEN(opt_hpa_hugification_threshold,
CTL_RO_NL_GEN(opt_hpa_hugify_delay_ms, opt_hpa_opts.hugify_delay_ms, uint64_t) CTL_RO_NL_GEN(opt_hpa_hugify_delay_ms, opt_hpa_opts.hugify_delay_ms, uint64_t)
CTL_RO_NL_GEN(opt_hpa_min_purge_interval_ms, opt_hpa_opts.min_purge_interval_ms, CTL_RO_NL_GEN(opt_hpa_min_purge_interval_ms, opt_hpa_opts.min_purge_interval_ms,
uint64_t) uint64_t)
CTL_RO_NL_GEN(opt_hpa_strict_min_purge_interval, CTL_RO_NL_GEN(opt_experimental_hpa_strict_min_purge_interval,
opt_hpa_opts.strict_min_purge_interval, bool) opt_hpa_opts.experimental_strict_min_purge_interval, bool)
CTL_RO_NL_GEN(opt_experimental_hpa_max_purge_nhp, CTL_RO_NL_GEN(opt_experimental_hpa_max_purge_nhp,
opt_hpa_opts.experimental_max_purge_nhp, ssize_t) opt_hpa_opts.experimental_max_purge_nhp, ssize_t)

2
src/hpa.c
View File

@@ -512,7 +512,7 @@ hpa_try_hugify(tsdn_t *tsdn, hpa_shard_t *shard) {
static bool static bool
hpa_min_purge_interval_passed(tsdn_t *tsdn, hpa_shard_t *shard) { hpa_min_purge_interval_passed(tsdn_t *tsdn, hpa_shard_t *shard) {
malloc_mutex_assert_owner(tsdn, &shard->mtx); malloc_mutex_assert_owner(tsdn, &shard->mtx);
if (shard->opts.strict_min_purge_interval) { if (shard->opts.experimental_strict_min_purge_interval) {
uint64_t since_last_purge_ms = shard->central->hooks.ms_since( uint64_t since_last_purge_ms = shard->central->hooks.ms_since(
&shard->last_purge); &shard->last_purge);
if (since_last_purge_ms < shard->opts.min_purge_interval_ms) { if (since_last_purge_ms < shard->opts.min_purge_interval_ms) {

4
src/jemalloc.c
View File

@@ -1555,8 +1555,8 @@ malloc_conf_init_helper(sc_data_t *sc_data, unsigned bin_shard_sizes[SC_NBINS],
CONF_DONT_CHECK_MIN, CONF_DONT_CHECK_MAX, false); CONF_DONT_CHECK_MIN, CONF_DONT_CHECK_MAX, false);
CONF_HANDLE_BOOL( CONF_HANDLE_BOOL(
opt_hpa_opts.strict_min_purge_interval, opt_hpa_opts.experimental_strict_min_purge_interval,
"hpa_strict_min_purge_interval"); "experimental_hpa_strict_min_purge_interval");
CONF_HANDLE_SSIZE_T( CONF_HANDLE_SSIZE_T(
opt_hpa_opts.experimental_max_purge_nhp, opt_hpa_opts.experimental_max_purge_nhp,

2
src/stats.c
View File

@@ -1564,7 +1564,7 @@ stats_general_print(emitter_t *emitter) {
OPT_WRITE_SIZE_T("hpa_hugification_threshold") OPT_WRITE_SIZE_T("hpa_hugification_threshold")
OPT_WRITE_UINT64("hpa_hugify_delay_ms") OPT_WRITE_UINT64("hpa_hugify_delay_ms")
OPT_WRITE_UINT64("hpa_min_purge_interval_ms") OPT_WRITE_UINT64("hpa_min_purge_interval_ms")
OPT_WRITE_BOOL("hpa_strict_min_purge_interval") OPT_WRITE_BOOL("experimental_hpa_strict_min_purge_interval")
OPT_WRITE_SSIZE_T("experimental_hpa_max_purge_nhp") OPT_WRITE_SSIZE_T("experimental_hpa_max_purge_nhp")
if (je_mallctl("opt.hpa_dirty_mult", (void *)&u32v, &u32sz, NULL, 0) if (je_mallctl("opt.hpa_dirty_mult", (void *)&u32v, &u32sz, NULL, 0)
== 0) { == 0) {

14
test/unit/hpa.c
View File

@@ -34,7 +34,7 @@ static hpa_shard_opts_t test_hpa_shard_opts_default = {
10 * 1000, 10 * 1000,
/* min_purge_interval_ms */ /* min_purge_interval_ms */
5 * 1000, 5 * 1000,
/* strict_min_purge_interval */ /* experimental_strict_min_purge_interval */
false, false,
/* experimental_max_purge_nhp */ /* experimental_max_purge_nhp */
-1 -1
@@ -53,7 +53,7 @@ static hpa_shard_opts_t test_hpa_shard_opts_purge = {
0, 0,
/* min_purge_interval_ms */ /* min_purge_interval_ms */
5 * 1000, 5 * 1000,
/* strict_min_purge_interval */ /* experimental_strict_min_purge_interval */
false, false,
/* experimental_max_purge_nhp */ /* experimental_max_purge_nhp */
-1 -1
@@ -506,7 +506,7 @@ TEST_BEGIN(test_purge_no_infinite_loop) {
} }
TEST_END TEST_END
TEST_BEGIN(test_strict_no_min_purge_interval) { TEST_BEGIN(test_no_experimental_strict_min_purge_interval) {
test_skip_if(!hpa_supported()); test_skip_if(!hpa_supported());
hpa_hooks_t hooks; hpa_hooks_t hooks;
@@ -547,7 +547,7 @@ TEST_BEGIN(test_strict_no_min_purge_interval) {
} }
TEST_END TEST_END
TEST_BEGIN(test_strict_min_purge_interval) { TEST_BEGIN(test_experimental_strict_min_purge_interval) {
test_skip_if(!hpa_supported()); test_skip_if(!hpa_supported());
hpa_hooks_t hooks; hpa_hooks_t hooks;
@@ -561,7 +561,7 @@ TEST_BEGIN(test_strict_min_purge_interval) {
hpa_shard_opts_t opts = test_hpa_shard_opts_default; hpa_shard_opts_t opts = test_hpa_shard_opts_default;
opts.deferral_allowed = true; opts.deferral_allowed = true;
opts.strict_min_purge_interval = true; opts.experimental_strict_min_purge_interval = true;
hpa_shard_t *shard = create_test_data(&hooks, &opts); hpa_shard_t *shard = create_test_data(&hooks, &opts);
@@ -741,8 +741,8 @@ main(void) {
test_alloc_dalloc_batch, test_alloc_dalloc_batch,
test_defer_time, test_defer_time,
test_purge_no_infinite_loop, test_purge_no_infinite_loop,
test_strict_no_min_purge_interval, test_no_experimental_strict_min_purge_interval,
test_strict_min_purge_interval, test_experimental_strict_min_purge_interval,
test_purge, test_purge,
test_experimental_max_purge_nhp); test_experimental_max_purge_nhp);
} }

2
test/unit/hpa_background_thread.sh
View File

@@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
export MALLOC_CONF="hpa_dirty_mult:0.001,hpa_hugification_threshold_ratio:1.0,hpa_min_purge_interval_ms:50,hpa_strict_min_purge_interval:true,hpa_sec_nshards:0" export MALLOC_CONF="hpa_dirty_mult:0.001,hpa_hugification_threshold_ratio:1.0,hpa_min_purge_interval_ms:50,hpa_sec_nshards:0"

2
test/unit/mallctl.c
View File

@@ -292,6 +292,8 @@ TEST_BEGIN(test_mallctl_opt) {
TEST_MALLCTL_OPT(size_t, hpa_sec_max_bytes, always); TEST_MALLCTL_OPT(size_t, hpa_sec_max_bytes, always);
TEST_MALLCTL_OPT(size_t, hpa_sec_bytes_after_flush, always); TEST_MALLCTL_OPT(size_t, hpa_sec_bytes_after_flush, always);
TEST_MALLCTL_OPT(size_t, hpa_sec_batch_fill_extra, always); TEST_MALLCTL_OPT(size_t, hpa_sec_batch_fill_extra, always);
TEST_MALLCTL_OPT(bool, experimental_hpa_strict_min_purge_interval,
always);
TEST_MALLCTL_OPT(ssize_t, experimental_hpa_max_purge_nhp, always); TEST_MALLCTL_OPT(ssize_t, experimental_hpa_max_purge_nhp, always);
TEST_MALLCTL_OPT(unsigned, narenas, always); TEST_MALLCTL_OPT(unsigned, narenas, always);
TEST_MALLCTL_OPT(const char *, percpu_arena, always); TEST_MALLCTL_OPT(const char *, percpu_arena, always);