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

don't reset a segment thread id when iterating

Browse source
This commit is contained in:
daanx 2024-06-03 18:19:45 -07:00
parent 537c51e227
commit 065f46cefb
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/arena-abandoned.c
View file

@ -82,7 +82,10 @@ 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 set 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); }

1
src/segment.c
View file

@ -836,6 +836,7 @@ void _mi_segment_page_abandon(mi_page_t* page, mi_segments_tld_t* tld) {
// Possibly clear pages and check if free space is available // Possibly clear pages and check if free space is available
static bool mi_segment_check_free(mi_segment_t* segment, size_t block_size, bool* all_pages_free) static bool mi_segment_check_free(mi_segment_t* segment, size_t block_size, bool* all_pages_free)
{ {
mi_assert_internal(mi_atomic_load_relaxed(&segment->thread_id) == 0);
bool has_page = false; bool has_page = false;
size_t pages_used = 0; size_t pages_used = 0;
size_t pages_used_empty = 0; size_t pages_used_empty = 0;