kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-04 22:49:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename segment_thread_collect to segment_collect

Browse source
This commit is contained in:
Daan 2024-04-19 12:11:58 -07:00
parent 0ea2e04902
commit 32e065bb32
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mimalloc/internal.h
View file

@ -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); void _mi_segment_huge_page_reset(mi_segment_t* segment, mi_page_t* page, mi_block_t* block);
#endif #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_reclaim_all(mi_heap_t* heap, mi_segments_tld_t* tld);
void _mi_abandoned_await_readers(void); void _mi_abandoned_await_readers(void);
bool _mi_segment_attempt_reclaim(mi_heap_t* heap, mi_segment_t* segment); bool _mi_segment_attempt_reclaim(mi_heap_t* heap, mi_segment_t* segment);

4
src/heap.c
View file

@ -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 ); mi_assert_internal( collect != MI_ABANDON || mi_atomic_load_ptr_acquire(mi_block_t,&heap->thread_delayed_free) == NULL );
// collect segment and thread caches // collect segment and thread caches
if (force) { _mi_segment_collect(force, &heap->tld->segments);
_mi_segment_thread_collect(&heap->tld->segments);
}
// if forced, collect thread data cache on program-exit (or shared library unload) // if forced, collect thread data cache on program-exit (or shared library unload)
if (force && _mi_is_main_thread() && mi_heap_is_backing(heap)) { if (force && _mi_is_main_thread() && mi_heap_is_backing(heap)) {

4
src/segment.c
View file

@ -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 // called by threads that are terminating to free cached segments
void _mi_segment_thread_collect(mi_segments_tld_t* tld) { void _mi_segment_collect(bool force, mi_segments_tld_t* tld) {
MI_UNUSED(tld); MI_UNUSED(force); MI_UNUSED(tld);
#if MI_DEBUG>=2 #if MI_DEBUG>=2
if (!_mi_is_main_thread()) { if (!_mi_is_main_thread()) {
mi_assert_internal(tld->pages_purge.first == NULL); mi_assert_internal(tld->pages_purge.first == NULL);