bc2879a956
Add back a feature that was available in the old heap implementation in release/v2.1 and earlier: keep track of which task allocates each block from the heap. The task handle is conditionally added as another word in the heap poisoning header under this configuration option CONFIG_HEAP_TASK_TRACKING. To allow custom monitoring and debugging code to be added, add helper functions in multi_heap.c and multi_heap_poisoning.c to provide access to information in the block headers. Add esp_heap_debug_dump_totals() to monitor heap usage esp_heap_debug_dump_totals() dumps into a user-provided data structure a summary of the amound of heap memory in region type that is used by each task. Optionally it will also dump into another data structure the metadata about each allocated block for a given list of tasks or for all tasks (limited by available space). Address change requests on PR #1498 This set of changes fixes the files in e3b702c to just add the CONFIG_HEAP_TASK_TRACKING option without adding the new function heap_caps_get_per_task_info() in case that is the only portion of the PR that will be accepted. Part of the change is to remove the new .c and .h files containing that function and to remove the line to compile it from components/heap/component.mk since it should not have been included in e3b702c. One or more additional commits to add the new function will follow. The other changes here: - uint32_t get_all_caps() moves to heap_private.h - replace "void* foo" with "void *foo" - add braces around single-line "if" blocks - replace tab characters with spaces Address change requests on PR #1498, part 2 This set of changes fixes the files in cdf32aa to add the new function heap_caps_get_per_task_info() with its new name and to add the line to compile it in components/heap/component.mk. This does not address all the suggested changes because there are some needing further discussion. This commit does not include the suggested change to move the declaration of the new function into esp_heap_caps.h because the new function references TaskHandle_t so esp_heap_caps.h would have to include freertos/FreeRTOS.h and freertos/task.h, but FreeRTOS.h includes esp_heap_caps.h through two other header files which results in compilation errors because not all of FreeRTOS.h has been read yet. Change heap_caps_get_per_task_info() to take struct of params In addition to moving the large number of function parameters into a struct as the single parameter, the following changes were made: - Clear out the totals for any prepopulated tasks so the app code doesn't have to do it. - Rather than partitioning the per-task totals into a predetermined set of heap capabilities, take a list of <caps,mask> pairs to compare the caps to the heap capabilities as masked. This lets the caller configure the desired partitioning, or none. - Allow the totals array pointer or the blocks array pointer to be NULL to indicate not to collect that part of the information. - In addition to returning the total space allocated by each task, return the number of blocks allocated by each task. - Don't need to return the heap capabilities as part of the details for each block since the heap region (and therefore its capabilities) can be determined from the block address. - Renamed heap_task_info.h to esp_heap_task_info.h to fit the naming convention, and renamed the structs for totals and block details to better fit the revised function name. - Provide full Doxygen commenting for the function and parameter structs. Add copyright header to new files Merges https://github.com/espressif/esp-idf/pull/1498
68 lines
3 KiB
C
68 lines
3 KiB
C
// 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.
|
|
#pragma once
|
|
|
|
/* Opaque handle to a heap block */
|
|
typedef const struct heap_block *multi_heap_block_handle_t;
|
|
|
|
/* Internal definitions for the "implementation" of the multi_heap API,
|
|
as defined in multi_heap.c.
|
|
|
|
If heap poisioning is disabled, these are aliased directly to the public API.
|
|
|
|
If heap poisoning is enabled, wrapper functions call each of these.
|
|
*/
|
|
void *multi_heap_malloc_impl(multi_heap_handle_t heap, size_t size);
|
|
void multi_heap_free_impl(multi_heap_handle_t heap, void *p);
|
|
void *multi_heap_realloc_impl(multi_heap_handle_t heap, void *p, size_t size);
|
|
multi_heap_handle_t multi_heap_register_impl(void *start, size_t size);
|
|
void multi_heap_get_info_impl(multi_heap_handle_t heap, multi_heap_info_t *info);
|
|
size_t multi_heap_free_size_impl(multi_heap_handle_t heap);
|
|
size_t multi_heap_minimum_free_size_impl(multi_heap_handle_t heap);
|
|
size_t multi_heap_get_allocated_size_impl(multi_heap_handle_t heap, void *p);
|
|
void *multi_heap_get_block_address_impl(multi_heap_block_handle_t block);
|
|
|
|
/* Some internal functions for heap poisoning use */
|
|
|
|
/* Check an allocated block's poison bytes are correct. Called by multi_heap_check(). */
|
|
bool multi_heap_internal_check_block_poisoning(void *start, size_t size, bool is_free, bool print_errors);
|
|
|
|
/* Fill a region of memory with the free or malloced pattern.
|
|
Called when merging blocks, to overwrite the old block header.
|
|
*/
|
|
void multi_heap_internal_poison_fill_region(void *start, size_t size, bool is_free);
|
|
|
|
/* Allow heap poisoning to lock/unlock the heap to avoid race conditions
|
|
if multi_heap_check() is running concurrently.
|
|
*/
|
|
void multi_heap_internal_lock(multi_heap_handle_t heap);
|
|
|
|
void multi_heap_internal_unlock(multi_heap_handle_t heap);
|
|
|
|
/* Some internal functions for heap debugging code to use */
|
|
|
|
/* Get the handle to the first (fixed free) block in a heap */
|
|
multi_heap_block_handle_t multi_heap_get_first_block(multi_heap_handle_t heap);
|
|
|
|
/* Get the handle to the next block in a heap, with validation */
|
|
multi_heap_block_handle_t multi_heap_get_next_block(multi_heap_handle_t heap, multi_heap_block_handle_t block);
|
|
|
|
/* Test if a heap block is free */
|
|
bool multi_heap_is_free(const multi_heap_block_handle_t block);
|
|
|
|
/* Get the data address of a heap block */
|
|
void *multi_heap_get_block_address(multi_heap_block_handle_t block);
|
|
|
|
/* Get the owner identification for a heap block */
|
|
void *multi_heap_get_block_owner(multi_heap_block_handle_t block);
|