Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(heap): Do not consider newly registered heap in minimum free size calcualtion

Browse Source 
After startup is done and app_main is reached, all calls to
heap_caps_add_region_with_caps (adding a new heap to the list of registered
heaps) will not affect the minimum free heap size value.

For heaps created before startup, this won't apply and their size will
end up being taken into account in the calculation of the minimum.
This commit is contained in:
Guillaume Souchere
2026-05-29 07:56:48 +02:00
parent 465c4ffc64
commit aaae14008a
5 changed files with 68 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/heap/test_apps/heap_tests/main/test_malloc_caps.c
+37
View File
@@ -12,6 +12,8 @@
#include "unity.h"
#include "esp_attr.h"
#include "esp_heap_caps.h"
#include "esp_heap_caps_init.h"
#include "heap_memory_layout.h"
#include "spi_flash_mmap.h"
#include "esp_memory_utils.h"
#include "esp_private/spi_flash_os.h"
@@ -206,6 +208,41 @@ TEST_CASE("heap caps minimum free bytes monitoring", "[heap]")
TEST_ASSERT(local_minimum_free_size >= free_size);
}
extern void set_leak_threshold(int threshold);
/* NOTE: This is not a well-formed unit test, it leaks memory */
TEST_CASE("heap registered after startup should not affect minimum free size", "[heap]")
{
printf("heap registered after startup should not affect minimum free size\n");
const uint32_t MALLOC_CAP_INVENTED = (1 << 29); /* unused capability, must differ from (1 << 30) used in test_runtime_heap_reg.c */
const size_t BUF_SZ = 3500;
uint32_t caps[SOC_MEMORY_TYPE_NO_PRIOS] = { MALLOC_CAP_INVENTED };
// Record the minimum free size for default caps before adding a new heap
size_t minimum_before = heap_caps_get_minimum_free_size(MALLOC_CAP_DEFAULT);
// Allocate a buffer and register it as a new heap region.
// Since we are past startup (app_main has been reached), the newly
// registered heap should NOT affect the minimum free size.
void *buffer = malloc(BUF_SZ);
TEST_ASSERT_NOT_NULL(buffer);
TEST_ESP_OK(heap_caps_add_region_with_caps(caps, (intptr_t)buffer, (intptr_t)buffer + BUF_SZ));
// The minimum free size for the invented capability should be 0
// because the heap was registered after startup.
size_t minimum_invented = heap_caps_get_minimum_free_size(MALLOC_CAP_INVENTED);
TEST_ASSERT_EQUAL(0, minimum_invented);
// The minimum free size for default caps should not have increased
// (it may have decreased slightly due to the malloc above).
size_t minimum_after = heap_caps_get_minimum_free_size(MALLOC_CAP_DEFAULT);
TEST_ASSERT(minimum_after <= minimum_before);
// set the leak threshold to a bigger value as this test leaks memory
set_leak_threshold(-4000);
}
TEST_CASE("heap caps minimum free bytes fault cases", "[heap]")
{
printf("heap caps minimum free bytes fault cases\n");