From a7370dcbd21f0497bbeb666f22f2e653001ab4c4 Mon Sep 17 00:00:00 2001 From: daanx Date: Wed, 22 Jan 2025 12:25:02 -0800 Subject: [PATCH 1/2] fix highest allocated page for arena unload --- src/arena.c | 9 +++++++-- test/main-override-dep.cpp | 10 ++++++++++ test/main-override-dep.h | 1 + test/main-override.cpp | 10 ++++++---- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/arena.c b/src/arena.c index bcde865e..4ad4bb0e 100644 --- a/src/arena.c +++ b/src/arena.c @@ -1834,8 +1834,13 @@ mi_decl_export bool mi_arena_unload(mi_arena_id_t arena_id, void** base, size_t* size_t asize; // scan the commit map for the highest entry size_t idx; - if (mi_bitmap_bsr(arena->slices_committed, &idx)) { - asize = (idx + 1)* MI_ARENA_SLICE_SIZE; + //if (mi_bitmap_bsr(arena->slices_committed, &idx)) { + // asize = (idx + 1)* MI_ARENA_SLICE_SIZE; + //} + if (mi_bitmap_bsr(arena->pages, &idx)) { + mi_page_t* page = (mi_page_t*)mi_arena_slice_start(arena, idx); + const size_t page_slice_count = page->memid.mem.arena.slice_count; + asize = mi_size_of_slices(idx + page_slice_count); } else { asize = mi_arena_info_slices(arena) * MI_ARENA_SLICE_SIZE; diff --git a/test/main-override-dep.cpp b/test/main-override-dep.cpp index e92f6fc4..edb57f1f 100644 --- a/test/main-override-dep.cpp +++ b/test/main-override-dep.cpp @@ -12,4 +12,14 @@ std::string TestAllocInDll::GetString() std::string r = test; delete[] test; return r; +} + +#include + +void TestAllocInDll::TestHeapAlloc() +{ + HANDLE heap = GetProcessHeap(); + int* p = (int*)HeapAlloc(heap, 0, sizeof(int)); + *p = 42; + HeapFree(heap, 0, p); } \ No newline at end of file diff --git a/test/main-override-dep.h b/test/main-override-dep.h index 4826f25f..9d4aabfd 100644 --- a/test/main-override-dep.h +++ b/test/main-override-dep.h @@ -8,4 +8,5 @@ class TestAllocInDll { public: __declspec(dllexport) std::string GetString(); + __declspec(dllexport) void TestHeapAlloc(); }; diff --git a/test/main-override.cpp b/test/main-override.cpp index db594acc..af385992 100644 --- a/test/main-override.cpp +++ b/test/main-override.cpp @@ -37,7 +37,7 @@ static void test_thread_local(); // issue #944 static void test_mixed1(); // issue #942 static void test_stl_allocators(); -#if x_WIN32 +#if _WIN32 #include "main-override-dep.h" static void test_dep(); // issue #981: test overriding in another DLL #else @@ -46,8 +46,8 @@ static void test_dep() { }; int main() { mi_stats_reset(); // ignore earlier allocations - various_tests(); - test_mixed1(); + //various_tests(); + //test_mixed1(); test_dep(); @@ -145,11 +145,13 @@ static bool test_stl_allocator1() { struct some_struct { int i; int j; double z; }; -#if x_WIN32 +#if _WIN32 static void test_dep() { TestAllocInDll t; std::string s = t.GetString(); + + t.TestHeapAlloc(); } #endif From dd4b6fc0783868c6ca19a57d6fb341f92a854e1e Mon Sep 17 00:00:00 2001 From: daanx Date: Fri, 31 Jan 2025 11:54:51 -0800 Subject: [PATCH 2/2] update options --- include/mimalloc.h | 7 +++---- src/options.c | 7 +++---- src/page.c | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/include/mimalloc.h b/include/mimalloc.h index 8b453247..46335619 100644 --- a/include/mimalloc.h +++ b/include/mimalloc.h @@ -381,11 +381,11 @@ typedef enum mi_option_e { mi_option_os_tag, // tag used for OS logging (macOS only for now) (=100) mi_option_max_errors, // issue at most N error messages mi_option_max_warnings, // issue at most N warning messages - mi_option_max_segment_reclaim, // max. percentage of the abandoned segments can be reclaimed per try (=10%) + mi_option_deprecated_max_segment_reclaim, // max. percentage of the abandoned segments can be reclaimed per try (=10%) mi_option_destroy_on_exit, // if set, release all memory on exit; sometimes used for dynamic unloading but can be unsafe mi_option_arena_reserve, // initial memory size for arena reservation (= 1 GiB on 64-bit) (internally, this value is in KiB; use `mi_option_get_size`) mi_option_arena_purge_mult, // multiplier for `purge_delay` for the purging delay for arenas (=10) - mi_option_purge_extend_delay, + mi_option_deprecated_purge_extend_delay, mi_option_disallow_arena_alloc, // 1 = do not use arena's for allocation (except if using specific arena id's) mi_option_retry_on_oom, // retry on out-of-memory for N milli seconds (=400), set to 0 to disable retries. (only on windows) mi_option_visit_abandoned, // allow visiting heap blocks from abandoned threads (=0) @@ -394,8 +394,7 @@ typedef enum mi_option_e { mi_option_guarded_precise, // disregard minimal alignment requirement to always place guarded blocks exactly in front of a guard page (=0) mi_option_guarded_sample_rate, // 1 out of N allocations in the min/max range will be guarded (=1000) mi_option_guarded_sample_seed, // can be set to allow for a (more) deterministic re-execution when a guard page is triggered (=0) - mi_option_target_segments_per_thread, // experimental (=0) - mi_option_reclaim_on_free, // allow to reclaim an abandoned segment on a free (=1) + mi_option_page_reclaim_on_free, // allow to reclaim an abandoned segment on a free (=1) mi_option_page_full_retain, // retain N full pages per size class (=2) mi_option_page_max_candidates, // max candidate pages to consider for allocation (=4) mi_option_max_vabits, // max user space virtual address bits to consider (=48) diff --git a/src/options.c b/src/options.c index 8d66b320..7b643092 100644 --- a/src/options.c +++ b/src/options.c @@ -150,11 +150,11 @@ static mi_option_desc_t options[_mi_option_last] = { 100, UNINIT, MI_OPTION(os_tag) }, // only apple specific for now but might serve more or less related purpose { 32, UNINIT, MI_OPTION(max_errors) }, // maximum errors that are output { 32, UNINIT, MI_OPTION(max_warnings) }, // maximum warnings that are output - { 10, UNINIT, MI_OPTION(max_segment_reclaim)}, // max. percentage of the abandoned segments to be reclaimed per try. + { 10, UNINIT, MI_OPTION(deprecated_max_segment_reclaim)}, // max. percentage of the abandoned segments to be reclaimed per try. { 0, UNINIT, MI_OPTION(destroy_on_exit)}, // release all OS memory on process exit; careful with dangling pointer or after-exit frees! { MI_DEFAULT_ARENA_RESERVE, UNINIT, MI_OPTION(arena_reserve) }, // reserve memory N KiB at a time (=1GiB) (use `option_get_size`) { 1, UNINIT, MI_OPTION(arena_purge_mult) }, // purge delay multiplier for arena's - { 1, UNINIT, MI_OPTION_LEGACY(purge_extend_delay, decommit_extend_delay) }, + { 1, UNINIT, MI_OPTION_LEGACY(deprecated_purge_extend_delay, decommit_extend_delay) }, { MI_DEFAULT_DISALLOW_ARENA_ALLOC, UNINIT, MI_OPTION(disallow_arena_alloc) }, // 1 = do not use arena's for allocation (except if using specific arena id's) { 400, UNINIT, MI_OPTION(retry_on_oom) }, // windows only: retry on out-of-memory for N milli seconds (=400), set to 0 to disable retries. #if defined(MI_VISIT_ABANDONED) @@ -168,8 +168,7 @@ static mi_option_desc_t options[_mi_option_last] = { MI_DEFAULT_GUARDED_SAMPLE_RATE, UNINIT, MI_OPTION(guarded_sample_rate)}, // 1 out of N allocations in the min/max range will be guarded (=4000) { 0, UNINIT, MI_OPTION(guarded_sample_seed)}, - { 0, UNINIT, MI_OPTION(target_segments_per_thread) }, // abandon segments beyond this point, or 0 to disable. - { 0, UNINIT, MI_OPTION_LEGACY(reclaim_on_free, abandoned_reclaim_on_free) },// reclaim an abandoned segment on a free + { 1, UNINIT, MI_OPTION_LEGACY(page_reclaim_on_free, abandoned_reclaim_on_free) },// reclaim an abandoned segment on a free { 2, UNINIT, MI_OPTION(page_full_retain) }, { 4, UNINIT, MI_OPTION(page_max_candidates) }, { 0, UNINIT, MI_OPTION(max_vabits) }, diff --git a/src/page.c b/src/page.c index d2d6a854..af1d5072 100644 --- a/src/page.c +++ b/src/page.c @@ -680,7 +680,7 @@ static mi_decl_noinline mi_page_t* mi_page_queue_find_free_ex(mi_heap_t* heap, m size_t count = 0; #endif long candidate_limit = 0; // we reset this on the first candidate to limit the search - long page_full_retain = heap->page_full_retain; + long page_full_retain = (pq->block_size > MI_SMALL_MAX_OBJ_SIZE ? 0 : heap->page_full_retain); // only retain small pages mi_page_t* page_candidate = NULL; // a page with free space mi_page_t* page = pq->first;