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

maintain count of the abandoned os list

Browse source
This commit is contained in:
daanx 2024-06-03 15:44:25 -07:00
parent 3333f776f9
commit 00dacba91f
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/arena.c
View file

@ -768,12 +768,15 @@ static bool mi_arena_segment_os_clear_abandoned(mi_segment_t* segment) {
mi_segment_t* const prev = segment->abandoned_os_prev; mi_segment_t* const prev = segment->abandoned_os_prev;
if (next != NULL || prev != NULL || subproc->abandoned_os_list == segment) { if (next != NULL || prev != NULL || subproc->abandoned_os_list == segment) {
#if MI_DEBUG>3 #if MI_DEBUG>3
// find ourselves in the abandoned list // find ourselves in the abandoned list (and check the count)
bool found = false; bool found = false;
for (mi_segment_t* current = subproc->abandoned_os_list; !found && current != NULL; current = current->abandoned_os_next) { size_t count = 0;
for (mi_segment_t* current = subproc->abandoned_os_list; current != NULL; current = current->abandoned_os_next) {
if (current == segment) { found = true; } if (current == segment) { found = true; }
count++;
} }
mi_assert_internal(found); mi_assert_internal(found);
mi_assert_internal(count == mi_atomic_load_relaxed(&subproc->abandoned_os_list_count));
#endif #endif
// remove (atomically) from the list and reclaim // remove (atomically) from the list and reclaim
if (prev != NULL) { prev->abandoned_os_next = next; } if (prev != NULL) { prev->abandoned_os_next = next; }
@ -782,7 +785,8 @@ static bool mi_arena_segment_os_clear_abandoned(mi_segment_t* segment) {
else { subproc->abandoned_os_list_tail = prev; } else { subproc->abandoned_os_list_tail = prev; }
segment->abandoned_os_next = NULL; segment->abandoned_os_next = NULL;
segment->abandoned_os_prev = NULL; segment->abandoned_os_prev = NULL;
mi_atomic_decrement_relaxed(&segment->subproc->abandoned_count); mi_atomic_decrement_relaxed(&subproc->abandoned_count);
mi_atomic_decrement_relaxed(&subproc->abandoned_os_list_count);
mi_atomic_store_release(&segment->thread_id, _mi_thread_id()); mi_atomic_store_release(&segment->thread_id, _mi_thread_id());
reclaimed = true; reclaimed = true;
} }
@ -827,7 +831,6 @@ static void mi_arena_segment_os_mark_abandoned(mi_segment_t* segment) {
// we can continue but cannot visit/reclaim such blocks.. // we can continue but cannot visit/reclaim such blocks..
} }
else { else {
mi_atomic_increment_relaxed(&subproc->abandoned_count);
// push on the tail of the list (important for the visitor) // push on the tail of the list (important for the visitor)
mi_segment_t* prev = subproc->abandoned_os_list_tail; mi_segment_t* prev = subproc->abandoned_os_list_tail;
mi_assert_internal(prev == NULL || prev->abandoned_os_next == NULL); mi_assert_internal(prev == NULL || prev->abandoned_os_next == NULL);
@ -838,6 +841,8 @@ static void mi_arena_segment_os_mark_abandoned(mi_segment_t* segment) {
subproc->abandoned_os_list_tail = segment; subproc->abandoned_os_list_tail = segment;
segment->abandoned_os_prev = prev; segment->abandoned_os_prev = prev;
segment->abandoned_os_next = NULL; segment->abandoned_os_next = NULL;
mi_atomic_increment_relaxed(&subproc->abandoned_os_list_count);
mi_atomic_increment_relaxed(&subproc->abandoned_count);
// and release the lock // and release the lock
mi_lock_release(&subproc->abandoned_os_lock); mi_lock_release(&subproc->abandoned_os_lock);
} }