From 666218d7532c51cf492ae911f658a98ba2134354 Mon Sep 17 00:00:00 2001 From: gaoxiaojie Date: Thu, 25 Nov 2021 10:22:41 +0800 Subject: [PATCH] heap: fix multi_heap_get_info_impl --- components/heap/multi_heap.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/components/heap/multi_heap.c b/components/heap/multi_heap.c index f9f1a6c5e0..059f6c19af 100644 --- a/components/heap/multi_heap.c +++ b/components/heap/multi_heap.c @@ -360,6 +360,8 @@ static void multi_heap_get_info_tlsf(void* ptr, size_t size, int used, void* use void multi_heap_get_info_impl(multi_heap_handle_t heap, multi_heap_info_t *info) { + uint32_t sl_interval; + memset(info, 0, sizeof(multi_heap_info_t)); if (heap == NULL) { @@ -371,6 +373,9 @@ void multi_heap_get_info_impl(multi_heap_handle_t heap, multi_heap_info_t *info) info->total_allocated_bytes = (heap->pool_size - tlsf_size()) - heap->free_bytes; info->minimum_free_bytes = heap->minimum_free_bytes; info->total_free_bytes = heap->free_bytes; - info->largest_free_block = info->largest_free_block ? 1 << (31 - __builtin_clz(info->largest_free_block)) : 0; + if (info->largest_free_block) { + sl_interval = (1 << (31 - __builtin_clz(info->largest_free_block))) / SL_INDEX_COUNT; + info->largest_free_block = info->largest_free_block & ~(sl_interval - 1); + } multi_heap_internal_unlock(heap); }