From c92a3ec6c31c7cf10c7705bc31f97d190ef44aab Mon Sep 17 00:00:00 2001 From: Sam Gross Date: Thu, 24 Oct 2019 15:49:47 -0400 Subject: [PATCH] Expose _mi_heap_is_valid --- include/mimalloc-internal.h | 1 + src/heap.c | 6 +++--- src/init.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/mimalloc-internal.h b/include/mimalloc-internal.h index e99e6df6..0f95fc41 100644 --- a/include/mimalloc-internal.h +++ b/include/mimalloc-internal.h @@ -105,6 +105,7 @@ void _mi_block_zero_init(const mi_page_t* page, void* p, size_t size); #if MI_DEBUG>1 bool _mi_page_is_valid(mi_page_t* page); +bool _mi_heap_is_valid(mi_heap_t* heap); #endif diff --git a/src/heap.c b/src/heap.c index 33610080..141a88b9 100644 --- a/src/heap.c +++ b/src/heap.c @@ -57,7 +57,7 @@ static bool _mi_heap_page_is_valid(mi_heap_t* heap, mi_page_queue_t* pq, mi_page return true; } -static bool mi_heap_is_valid(mi_heap_t* heap) { +bool _mi_heap_is_valid(mi_heap_t* heap) { mi_assert_internal(heap!=NULL); mi_heap_visit_pages(heap, &_mi_heap_page_is_valid, NULL, NULL); return true; @@ -278,7 +278,7 @@ void _mi_heap_destroy_pages(mi_heap_t* heap) { void mi_heap_destroy(mi_heap_t* heap) { mi_assert(mi_heap_is_initialized(heap)); mi_assert(heap->no_reclaim); - mi_assert_expensive(mi_heap_is_valid(heap)); + mi_assert_expensive(_mi_heap_is_valid(heap)); if (!mi_heap_is_initialized(heap)) return; if (!heap->no_reclaim) { // don't free in case it may contain reclaimed pages @@ -335,7 +335,7 @@ static void mi_heap_absorb(mi_heap_t* heap, mi_heap_t* from) { void mi_heap_delete(mi_heap_t* heap) { mi_assert(mi_heap_is_initialized(heap)); - mi_assert_expensive(mi_heap_is_valid(heap)); + mi_assert_expensive(_mi_heap_is_valid(heap)); if (!mi_heap_is_initialized(heap)) return; if (!mi_heap_is_backing(heap)) { diff --git a/src/init.c b/src/init.c index f85cb51b..1efe4a02 100644 --- a/src/init.c +++ b/src/init.c @@ -314,7 +314,7 @@ static void _mi_thread_done(mi_heap_t* heap) mi_attr_noexcept; mi_heap_t* mi_heap_set_default(mi_heap_t* heap) { mi_assert(mi_heap_is_initialized(heap)); if (!mi_heap_is_initialized(heap)) return NULL; - mi_assert_expensive(mi_heap_is_valid(heap)); + mi_assert_expensive(_mi_heap_is_valid(heap)); mi_heap_t* old = _mi_heap_default; _mi_heap_default = heap;