alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/multi_heap_get_info_impl_backport_v4.4' into 'release/v4.4'

Browse Source 
heap: fix multi_heap_get_info_impl(backport v4.4)

See merge request espressif/esp-idf!16119
This commit is contained in:
Jiang Jiang Jian 2021-11-26 05:44:49 +00:00
commit fe91b306e4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/heap/multi_heap.c
View File

@ -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) 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)); memset(info, 0, sizeof(multi_heap_info_t));
if (heap == NULL) { 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->total_allocated_bytes = (heap->pool_size - tlsf_size()) - heap->free_bytes;
info->minimum_free_bytes = heap->minimum_free_bytes; info->minimum_free_bytes = heap->minimum_free_bytes;
info->total_free_bytes = heap->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); multi_heap_internal_unlock(heap);
} }