merge from dev

This commit is contained in:
daanx 2024-06-03 18:27:33 -07:00
commit 614c4944e5

View file

@ -82,7 +82,9 @@ static bool mi_arena_segment_os_clear_abandoned(mi_segment_t* segment, bool take
segment->abandoned_os_prev = NULL; segment->abandoned_os_prev = NULL;
mi_atomic_decrement_relaxed(&subproc->abandoned_count); mi_atomic_decrement_relaxed(&subproc->abandoned_count);
mi_atomic_decrement_relaxed(&subproc->abandoned_os_list_count); mi_atomic_decrement_relaxed(&subproc->abandoned_os_list_count);
if (take_lock) { // don't reset the thread_id when iterating
mi_atomic_store_release(&segment->thread_id, _mi_thread_id()); mi_atomic_store_release(&segment->thread_id, _mi_thread_id());
}
reclaimed = true; reclaimed = true;
} }
if (take_lock) { mi_lock_release(&segment->subproc->abandoned_os_lock); } if (take_lock) { mi_lock_release(&segment->subproc->abandoned_os_lock); }