From 2db407d1e9ce00bc8e6363e66d845fc9ec78628b Mon Sep 17 00:00:00 2001 From: Daan Leijen Date: Fri, 20 Dec 2024 11:54:39 -0800 Subject: [PATCH 1/2] revert back to generating mimalloc.dll instead of mimalloc-override.dll --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e7a6aca..30a6b3e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -673,8 +673,8 @@ if (MI_OVERRIDE) target_compile_definitions(mimalloc PRIVATE MI_MALLOC_OVERRIDE) if (WIN32) # on windows we should generate mimalloc-override.dll. - string(REPLACE "mimalloc" "mimalloc-override" mi_override_output_name ${mi_basename}) - set_target_properties(mimalloc PROPERTIES OUTPUT_NAME ${mi_override_output_name}) + # string(REPLACE "mimalloc" "mimalloc-override" mi_override_output_name ${mi_basename}) + # set_target_properties(mimalloc PROPERTIES OUTPUT_NAME ${mi_override_output_name}) endif() endif() if(NOT WIN32) From 5614c5052ec5d7490391da3b98dc4bdcc0e1ed7c Mon Sep 17 00:00:00 2001 From: Daan Leijen Date: Fri, 20 Dec 2024 11:56:04 -0800 Subject: [PATCH 2/2] don't prefer high used candidate if it is too full --- src/page.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/page.c b/src/page.c index a30db6c9..0de56752 100644 --- a/src/page.c +++ b/src/page.c @@ -682,7 +682,7 @@ static mi_decl_noinline mi_page_t* mi_page_queue_find_free_ex(mi_heap_t* heap, m _mi_page_free(page_candidate, pq); page_candidate = page; } - else if (page->used >= page_candidate->used) { // && !mi_page_is_mostly_used(page)) { + else if (page->used >= page_candidate->used && !mi_page_is_mostly_used(page)) { page_candidate = page; } // if we find a non-expandable candidate, or searched for N pages, return with the best candidate