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

merge from dev-steal

Browse source
This commit is contained in:
daanx 2024-11-25 19:17:25 -08:00
commit 25f84f5fd1
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/mimalloc/types.h
View file

@ -475,6 +475,7 @@ typedef struct mi_segment_s {
// from here is zero initialized // from here is zero initialized
struct mi_segment_s* next; // the list of freed segments in the cache (must be first field, see `segment.c:mi_segment_init`) struct mi_segment_s* next; // the list of freed segments in the cache (must be first field, see `segment.c:mi_segment_init`)
bool was_reclaimed; // true if it was reclaimed (used to limit on-free reclamation) bool was_reclaimed; // true if it was reclaimed (used to limit on-free reclamation)
bool dont_free; // can be temporarily true to ensure the segment is not freed
size_t abandoned; // abandoned pages (i.e. the original owning thread stopped) (`abandoned <= used`) size_t abandoned; // abandoned pages (i.e. the original owning thread stopped) (`abandoned <= used`)
size_t abandoned_visits; // count how often this segment is visited during abondoned reclamation (to force reclaim if it takes too long) size_t abandoned_visits; // count how often this segment is visited during abondoned reclamation (to force reclaim if it takes too long)

6
src/page.c
View file

@ -412,10 +412,8 @@ void _mi_page_force_abandon(mi_page_t* page) {
// ensure this page is no longer in the heap delayed free list // ensure this page is no longer in the heap delayed free list
_mi_heap_delayed_free_all(heap); _mi_heap_delayed_free_all(heap);
// TODO: can we still access the page as it may have been // We can still access the page meta-info even if it is freed as we ensure
// freed and the memory decommitted? // in `mi_segment_force_abandon` that the segment is not freed (yet)
// A way around this is to explicitly unlink this page from
// the heap delayed free list.
if (page->capacity == 0) return; // it may have been freed now if (page->capacity == 0) return; // it may have been freed now
// and now unlink it from the page queue and abandon (or free) // and now unlink it from the page queue and abandon (or free)

11
src/segment.c
View file

@ -958,6 +958,9 @@ static void mi_segment_free(mi_segment_t* segment, bool force, mi_segments_tld_t
mi_assert_internal(segment != NULL); mi_assert_internal(segment != NULL);
mi_assert_internal(segment->next == NULL); mi_assert_internal(segment->next == NULL);
mi_assert_internal(segment->used == 0); mi_assert_internal(segment->used == 0);
// in `mi_segment_force_abandon` we set this to true to ensure the segment's memory stays valid
if (segment->dont_free) return;
// Remove the free pages // Remove the free pages
mi_slice_t* slice = &segment->slices[0]; mi_slice_t* slice = &segment->slices[0];
@ -1387,6 +1390,10 @@ void _mi_abandoned_collect(mi_heap_t* heap, bool force, mi_segments_tld_t* tld)
static void mi_segment_force_abandon(mi_segment_t* segment, mi_segments_tld_t* tld) static void mi_segment_force_abandon(mi_segment_t* segment, mi_segments_tld_t* tld)
{ {
mi_assert_internal(!mi_segment_is_abandoned(segment)); mi_assert_internal(!mi_segment_is_abandoned(segment));
mi_assert_internal(!segment->dont_free);
// ensure the segment does not get free'd underneath us (so we can check if a page has been freed in `mi_page_force_abandon`)
segment->dont_free = true;
// for all slices // for all slices
const mi_slice_t* end; const mi_slice_t* end;
@ -1404,6 +1411,7 @@ static void mi_segment_force_abandon(mi_segment_t* segment, mi_segments_tld_t* t
if (segment->used == segment->abandoned+1) { if (segment->used == segment->abandoned+1) {
// the last page.. abandon and return as the segment will be abandoned after this // the last page.. abandon and return as the segment will be abandoned after this
// and we should no longer access it. // and we should no longer access it.
segment->dont_free = false;
_mi_page_force_abandon(page); _mi_page_force_abandon(page);
return; return;
} }
@ -1417,9 +1425,10 @@ static void mi_segment_force_abandon(mi_segment_t* segment, mi_segments_tld_t* t
} }
slice = slice + slice->slice_count; slice = slice + slice->slice_count;
} }
segment->dont_free = false;
mi_assert(segment->used == segment->abandoned); mi_assert(segment->used == segment->abandoned);
mi_assert(segment->used == 0); mi_assert(segment->used == 0);
if (segment->used == 0) { if (segment->used == 0) { // paranoia
// all free now // all free now
mi_segment_free(segment, false, tld); mi_segment_free(segment, false, tld);
} }