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

use always abandon on heap delete

Browse source
This commit is contained in:
daanx 2024-12-11 09:24:38 -08:00
commit 64eea823e4
1 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/heap.c
View file

@ -417,30 +417,30 @@ void _mi_heap_unsafe_destroy_all(void) {
----------------------------------------------------------- */ ----------------------------------------------------------- */
// Transfer the pages from one heap to the other // Transfer the pages from one heap to the other
static void mi_heap_absorb(mi_heap_t* heap, mi_heap_t* from) { //static void mi_heap_absorb(mi_heap_t* heap, mi_heap_t* from) {
mi_assert_internal(heap!=NULL); // mi_assert_internal(heap!=NULL);
if (from==NULL || from->page_count == 0) return; // if (from==NULL || from->page_count == 0) return;
//
// // transfer all pages by appending the queues; this will set a new heap field
// for (size_t i = 0; i <= MI_BIN_FULL; i++) {
// mi_page_queue_t* pq = &heap->pages[i];
// mi_page_queue_t* append = &from->pages[i];
// size_t pcount = _mi_page_queue_append(heap, pq, append);
// heap->page_count += pcount;
// from->page_count -= pcount;
// }
// mi_assert_internal(from->page_count == 0);
//
// // and reset the `from` heap
// mi_heap_reset_pages(from);
//}
// transfer all pages by appending the queues; this will set a new heap field //// are two heaps compatible with respect to heap-tag, exclusive arena etc.
for (size_t i = 0; i <= MI_BIN_FULL; i++) { //static bool mi_heaps_are_compatible(mi_heap_t* heap1, mi_heap_t* heap2) {
mi_page_queue_t* pq = &heap->pages[i]; // return (heap1->tag == heap2->tag && // store same kind of objects
mi_page_queue_t* append = &from->pages[i]; // heap1->tld->subproc == heap2->tld->subproc && // same sub-process
size_t pcount = _mi_page_queue_append(heap, pq, append); // heap1->arena_id == heap2->arena_id); // same arena preference
heap->page_count += pcount; //}
from->page_count -= pcount;
}
mi_assert_internal(from->page_count == 0);
// and reset the `from` heap
mi_heap_reset_pages(from);
}
// are two heaps compatible with respect to heap-tag, exclusive arena etc.
static bool mi_heaps_are_compatible(mi_heap_t* heap1, mi_heap_t* heap2) {
return (heap1->tag == heap2->tag && // store same kind of objects
heap1->tld->subproc == heap2->tld->subproc && // same sub-process
heap1->arena_id == heap2->arena_id); // same arena preference
}
// Safe delete a heap without freeing any still allocated blocks in that heap. // Safe delete a heap without freeing any still allocated blocks in that heap.
void mi_heap_delete(mi_heap_t* heap) void mi_heap_delete(mi_heap_t* heap)
@ -450,13 +450,16 @@ void mi_heap_delete(mi_heap_t* heap)
mi_assert_expensive(mi_heap_is_valid(heap)); mi_assert_expensive(mi_heap_is_valid(heap));
if (heap==NULL || !mi_heap_is_initialized(heap)) return; if (heap==NULL || !mi_heap_is_initialized(heap)) return;
/*
mi_heap_t* bheap = heap->tld->heap_backing; mi_heap_t* bheap = heap->tld->heap_backing;
if (heap != bheap && mi_heaps_are_compatible(bheap,heap)) { if (bheap != heap && mi_heaps_are_compatible(bheap,heap)) {
// transfer still used pages to the backing heap // transfer still used pages to the backing heap
mi_heap_absorb(heap->tld->heap_backing, heap); mi_heap_absorb(bheap, heap);
} }
else { else
// the backing heap abandons its pages */
{
// abandon all pages
_mi_heap_collect_abandon(heap); _mi_heap_collect_abandon(heap);
} }
mi_assert_internal(heap->page_count==0); mi_assert_internal(heap->page_count==0);