kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-06 23:39:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename full_page_retain to page_full_retain for consistency with the option

Browse source
This commit is contained in:
Daan Leijen 2025-01-07 21:42:30 -08:00
parent 061ef80de7
commit 57eee51f46
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mimalloc/types.h
View file

@ -426,7 +426,7 @@ struct mi_heap_s {
size_t page_retired_max; // largest retired index into the `pages` array.
size_t generic_count; // how often is mimalloc_generic invoked?
mi_heap_t* next; // list of heaps per thread
long full_page_retain; // how many full pages can be retained per queue (before abondoning them)
long page_full_retain; // how many full pages can be retained per queue (before abondoning them)
bool allow_page_reclaim; // `true` if this heap should not reclaim abandoned pages
bool allow_page_abandon; // `true` if this heap can abandon pages to reduce memory footprint
uint8_t tag; // custom tag, can be used for separating heaps based on the object types

6
src/heap.c
View file

@ -177,15 +177,15 @@ void _mi_heap_init(mi_heap_t* heap, mi_arena_id_t arena_id, bool allow_destroy,
heap->exclusive_arena = _mi_arena_from_id(arena_id);
heap->allow_page_reclaim = (!allow_destroy && mi_option_is_enabled(mi_option_reclaim_on_free));
heap->allow_page_abandon = (!allow_destroy && mi_option_get(mi_option_page_full_retain) >= 0);
heap->full_page_retain = mi_option_get_clamp(mi_option_page_full_retain, -1, 32);
heap->page_full_retain = mi_option_get_clamp(mi_option_page_full_retain, -1, 32);
heap->tag = heap_tag;
if (heap->tld->is_in_threadpool) {
// if we run as part of a thread pool it is better to not arbitrarily reclaim abandoned pages into our heap.
heap->allow_page_reclaim = false;
// .. but abandoning is good in this case: quarter the full page retain (possibly to 0)
// (so blocked threads do not hold on to too much memory)
if (heap->full_page_retain >= 0) {
heap->full_page_retain = heap->full_page_retain / 4;
if (heap->page_full_retain >= 0) {
heap->page_full_retain = heap->page_full_retain / 4;
}
}

2
src/init.c
View file

@ -261,7 +261,7 @@ static void mi_heap_main_init(void) {
_mi_heap_guarded_init(&heap_main);
heap_main.allow_page_reclaim = mi_option_is_enabled(mi_option_reclaim_on_free);
heap_main.allow_page_abandon = (mi_option_get(mi_option_page_full_retain) >= 0);
heap_main.full_page_retain = mi_option_get_clamp(mi_option_page_full_retain, -1, 32);
heap_main.page_full_retain = mi_option_get_clamp(mi_option_page_full_retain, -1, 32);
}
}

6
src/page.c
View file

@ -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 full_page_retain = heap->full_page_retain;
long page_full_retain = heap->page_full_retain;
mi_page_t* page_candidate = NULL; // a page with free space
mi_page_t* page = pq->first;
@ -703,8 +703,8 @@ static mi_decl_noinline mi_page_t* mi_page_queue_find_free_ex(mi_heap_t* heap, m
// if the page is completely full, move it to the `mi_pages_full`
// queue so we don't visit long-lived pages too often.
if (!immediate_available && !mi_page_is_expandable(page)) {
full_page_retain--;
if (full_page_retain < 0) {
page_full_retain--;
if (page_full_retain < 0) {
mi_assert_internal(!mi_page_is_in_full(page) && !mi_page_immediate_available(page));
mi_page_to_full(page, pq);
}