From 0028e2c23c74872f9e424652a4758a358666b797 Mon Sep 17 00:00:00 2001 From: gaoxiaojie Date: Thu, 14 Oct 2021 10:43:13 +0800 Subject: [PATCH] heap: fix multi_heap_get_info_impl --- components/heap/multi_heap.c | 25 +++++++++++-------------- tools/ci/check_copyright_ignore.txt | 1 - 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/components/heap/multi_heap.c b/components/heap/multi_heap.c index f9f1a6c5e0..d707ea3b2a 100644 --- a/components/heap/multi_heap.c +++ b/components/heap/multi_heap.c @@ -1,16 +1,8 @@ -// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at - -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include #include @@ -360,6 +352,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 +365,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); } diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index d70aa24366..0b600dc9e9 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -1470,7 +1470,6 @@ components/heap/include/esp_heap_trace.h components/heap/include/heap_memory_layout.h components/heap/include/multi_heap.h components/heap/include/soc/soc_memory_layout.h -components/heap/multi_heap.c components/heap/multi_heap_config.h components/heap/multi_heap_internal.h components/heap/multi_heap_platform.h