lihao/jemalloc
1
0
Fork 0
mirror of https://github.com/jemalloc/jemalloc.git synced 2026-07-22 04:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove experimental_hpa_max_purge_nhp option

Browse Source 
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:
Schalk Krüger
2026-06-26 13:53:05 -07:00
committed by Slobodan Predolac
parent db15a39d75
commit 43a8adc187
12 changed files with 2 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/stress/pa/pa_microbench.c
View File

@@ -101,7 +101,6 @@ static hpa_shard_opts_t g_hpa_opts = {
/* hugify_delay_ms */ 7804,
/* hugify_sync */ false,
/* min_purge_interval_ms */ 5 * 1000,
/* experimental_max_purge_nhp */ -1,
/* purge_threshold */ HUGEPAGE,
/* min_purge_delay_ms */ 0,
/* hugify_style */ hpa_hugify_style_eager

77
test/unit/hpa.c
View File

@@ -36,8 +36,6 @@ static hpa_shard_opts_t test_hpa_shard_opts_default = {
false,
/* min_purge_interval_ms */
5 * 1000,
/* experimental_max_purge_nhp */
-1,
/* purge_threshold */
1,
/* min_purge_delay_ms */
@@ -60,8 +58,6 @@ static hpa_shard_opts_t test_hpa_shard_opts_purge = {
false,
/* min_purge_interval_ms */
5 * 1000,
/* experimental_max_purge_nhp */
-1,
/* purge_threshold */
1,
/* min_purge_delay_ms */
@@ -84,8 +80,6 @@ static hpa_shard_opts_t test_hpa_shard_opts_aggressive = {
false,
/* min_purge_interval_ms */
5,
/* experimental_max_purge_nhp */
-1,
/* purge_threshold */
HUGEPAGE - 5 * PAGE,
/* min_purge_delay_ms */
@@ -636,74 +630,6 @@ TEST_BEGIN(test_purge) {
}
TEST_END
TEST_BEGIN(test_experimental_max_purge_nhp) {
test_skip_if(!hpa_supported());
hpa_hooks_t hooks;
hooks.map = &defer_test_map;
hooks.unmap = &defer_test_unmap;
hooks.purge = &defer_test_purge;
hooks.hugify = &defer_test_hugify;
hooks.dehugify = &defer_test_dehugify;
hooks.curtime = &defer_test_curtime;
hooks.ms_since = &defer_test_ms_since;
hooks.vectorized_purge = &defer_vectorized_purge;
hpa_shard_opts_t opts = test_hpa_shard_opts_default;
opts.deferral_allowed = true;
opts.experimental_max_purge_nhp = 1;
hpa_shard_t *shard = create_test_data(&hooks, &opts);
bool deferred_work_generated = false;
nstime_init(&defer_curtime, 0);
tsdn_t *tsdn = tsd_tsdn(tsd_fetch());
enum { NALLOCS = 8 * HUGEPAGE_PAGES };
edata_t *edatas[NALLOCS];
for (int i = 0; i < NALLOCS; i++) {
edatas[i] = hpa_alloc(tsdn, shard, PAGE, PAGE, false,
false, false, &deferred_work_generated);
expect_ptr_not_null(edatas[i], "Unexpected null edata");
}
/* Deallocate 3 hugepages out of 8. */
for (int i = 0; i < 3 * (int)HUGEPAGE_PAGES; i++) {
hpa_dalloc(tsdn, shard, edatas[i], &deferred_work_generated);
}
nstime_init2(&defer_curtime, 6, 0);
hpa_shard_do_deferred_work(tsdn, shard);
expect_zu_eq(0, ndefer_hugify_calls, "Hugified too early");
expect_zu_eq(0, ndefer_dehugify_calls, "Dehugified too early");
/*
* Expect only one purge call, because opts.experimental_max_purge_nhp
* is set to 1.
*/
expect_zu_eq(1, ndefer_purge_calls, "Expect purges");
ndefer_purge_calls = 0;
nstime_init2(&defer_curtime, 12, 0);
hpa_shard_do_deferred_work(tsdn, shard);
expect_zu_eq(5, ndefer_hugify_calls, "Expect hugification");
ndefer_hugify_calls = 0;
expect_zu_eq(0, ndefer_dehugify_calls, "Dehugified too early");
/* We still above the limit for dirty pages. */
expect_zu_eq(1, ndefer_purge_calls, "Expect purge");
ndefer_purge_calls = 0;
nstime_init2(&defer_curtime, 18, 0);
hpa_shard_do_deferred_work(tsdn, shard);
expect_zu_eq(0, ndefer_hugify_calls, "Hugified too early");
expect_zu_eq(0, ndefer_dehugify_calls, "Dehugified too early");
/* Finally, we are below the limit, no purges are expected. */
expect_zu_eq(0, ndefer_purge_calls, "Purged too early");
destroy_test_data(shard);
}
TEST_END
TEST_BEGIN(test_vectorized_opt_eq_zero) {
test_skip_if(!hpa_supported() || (opt_process_madvise_max_batch != 0));
@@ -1442,8 +1368,7 @@ main(void) {
(void)mem_tree_destroy;
return test_no_reentrancy(test_alloc_max, test_stress, test_defer_time,
test_purge_no_infinite_loop, test_no_min_purge_interval,
test_min_purge_interval, test_purge,
test_experimental_max_purge_nhp, test_vectorized_opt_eq_zero,
test_min_purge_interval, test_purge, test_vectorized_opt_eq_zero,
test_starts_huge, test_start_huge_purge_empty_only,
test_assume_huge_purge_fully, test_eager_with_purge_threshold,
test_delay_when_not_allowed_deferral, test_deferred_until_time,

2
test/unit/hpa_sec_integration.c
View File

@@ -36,8 +36,6 @@ static hpa_shard_opts_t test_hpa_shard_opts = {
false,
/* min_purge_interval_ms */
5,
/* experimental_max_purge_nhp */
-1,
/* purge_threshold */
PAGE,
/* min_purge_delay_ms */

2
test/unit/hpa_thp_always.c
View File

@@ -36,8 +36,6 @@ static hpa_shard_opts_t test_hpa_shard_opts_aggressive = {
false,
/* min_purge_interval_ms */
5,
/* experimental_max_purge_nhp */
-1,
/* purge_threshold */
HUGEPAGE - 5 * PAGE,
/* min_purge_delay_ms */

2
test/unit/hpa_vectorized_madvise.c
View File

@@ -36,8 +36,6 @@ static hpa_shard_opts_t test_hpa_shard_opts_default = {
false,
/* min_purge_interval_ms */
5 * 1000,
/* experimental_max_purge_nhp */
-1,
/* purge_threshold */
1,
/* purge_delay_ms */

2
test/unit/hpa_vectorized_madvise_large_batch.c
View File

@@ -37,8 +37,6 @@ static hpa_shard_opts_t test_hpa_shard_opts_default = {
false,
/* min_purge_interval_ms */
5 * 1000,
/* experimental_max_purge_nhp */
-1,
/* purge_threshold */
1,
/* min_purge_delay_ms */

1
test/unit/mallctl.c
View File

@@ -533,7 +533,6 @@ TEST_BEGIN(test_mallctl_opt) {
TEST_MALLCTL_OPT(size_t, experimental_pac_sec_nshards, always);
TEST_MALLCTL_OPT(size_t, experimental_pac_sec_max_alloc, always);
TEST_MALLCTL_OPT(size_t, experimental_pac_sec_max_bytes, always);
TEST_MALLCTL_OPT(ssize_t, experimental_hpa_max_purge_nhp, always);
TEST_MALLCTL_OPT(size_t, hpa_purge_threshold, always);
TEST_MALLCTL_OPT(uint64_t, hpa_min_purge_delay_ms, always);
TEST_MALLCTL_OPT(const char *, hpa_hugify_style, always);