From 32e065bb326bf630a37b35f0d1790608c5fe133b Mon Sep 17 00:00:00 2001 From: Daan Date: Fri, 19 Apr 2024 12:11:58 -0700 Subject: [PATCH] rename segment_thread_collect to segment_collect --- include/mimalloc/internal.h | 2 +- src/heap.c | 4 +--- src/segment.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/mimalloc/internal.h b/include/mimalloc/internal.h index 12436ca4..9b364f86 100644 --- a/include/mimalloc/internal.h +++ b/include/mimalloc/internal.h @@ -155,7 +155,7 @@ void _mi_segment_huge_page_free(mi_segment_t* segment, mi_page_t* page, mi void _mi_segment_huge_page_reset(mi_segment_t* segment, mi_page_t* page, mi_block_t* block); #endif -void _mi_segment_thread_collect(mi_segments_tld_t* tld); +void _mi_segment_collect(bool force, mi_segments_tld_t* tld); void _mi_abandoned_reclaim_all(mi_heap_t* heap, mi_segments_tld_t* tld); void _mi_abandoned_await_readers(void); bool _mi_segment_attempt_reclaim(mi_heap_t* heap, mi_segment_t* segment); diff --git a/src/heap.c b/src/heap.c index 328c708c..cf66c3bd 100644 --- a/src/heap.c +++ b/src/heap.c @@ -154,9 +154,7 @@ static void mi_heap_collect_ex(mi_heap_t* heap, mi_collect_t collect) mi_assert_internal( collect != MI_ABANDON || mi_atomic_load_ptr_acquire(mi_block_t,&heap->thread_delayed_free) == NULL ); // collect segment and thread caches - if (force) { - _mi_segment_thread_collect(&heap->tld->segments); - } + _mi_segment_collect(force, &heap->tld->segments); // if forced, collect thread data cache on program-exit (or shared library unload) if (force && _mi_is_main_thread() && mi_heap_is_backing(heap)) { diff --git a/src/segment.c b/src/segment.c index 91ff9adb..de413cc2 100644 --- a/src/segment.c +++ b/src/segment.c @@ -516,8 +516,8 @@ static void mi_segment_os_free(mi_segment_t* segment, size_t segment_size, mi_se } // called by threads that are terminating to free cached segments -void _mi_segment_thread_collect(mi_segments_tld_t* tld) { - MI_UNUSED(tld); +void _mi_segment_collect(bool force, mi_segments_tld_t* tld) { + MI_UNUSED(force); MI_UNUSED(tld); #if MI_DEBUG>=2 if (!_mi_is_main_thread()) { mi_assert_internal(tld->pages_purge.first == NULL);