ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add mbed_heap_size_total var

pull/15531/head
Johannes Stratmann 2025-01-06 15:30:27 +01:00
parent 3d82f3ca66
commit cdb83c2ed7
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmsis/device/rtos/TOOLCHAIN_GCC_ARM/mbed_boot_gcc_arm.c
View File

@ -60,9 +60,13 @@ void software_init_hook(void)
mbed_heap_size = (uint32_t) &__mbed_krbs_start - (uint32_t) &__mbed_sbrk_start; mbed_heap_size = (uint32_t) &__mbed_krbs_start - (uint32_t) &__mbed_sbrk_start;
mbed_heap_start_0 = (unsigned char *) &__mbed_sbrk_start_0; mbed_heap_start_0 = (unsigned char *) &__mbed_sbrk_start_0;
mbed_heap_size_0 = (uint32_t) &__mbed_krbs_start_0 - (uint32_t) &__mbed_sbrk_start_0; mbed_heap_size_0 = (uint32_t) &__mbed_krbs_start_0 - (uint32_t) &__mbed_sbrk_start_0;
mbed_heap_size_total = mbed_heap_size + mbed_heap_size_0;
#else #else
mbed_heap_start = (unsigned char *) &__end__; mbed_heap_start = (unsigned char *) &__end__;
mbed_heap_size = (uint32_t) &__HeapLimit - (uint32_t) &__end__; mbed_heap_size = (uint32_t) &__HeapLimit - (uint32_t) &__end__;
mbed_heap_size_total = mbed_heap_size;
#endif #endif
mbed_init(); mbed_init();

1
cmsis/device/rtos/include/mbed_boot.h
View File

@ -57,6 +57,7 @@ extern "C" {
/* Heap limits - only used if set */ /* Heap limits - only used if set */
extern unsigned char *mbed_heap_start; extern unsigned char *mbed_heap_start;
extern uint32_t mbed_heap_size; extern uint32_t mbed_heap_size;
extern uint32_t mbed_heap_size_total;
#if defined(MBED_SPLIT_HEAP) #if defined(MBED_SPLIT_HEAP)
extern unsigned char *mbed_heap_start_0; extern unsigned char *mbed_heap_start_0;

9
platform/source/mbed_alloc_wrappers.cpp
View File

@ -73,13 +73,8 @@ static int get_malloc_block_total_size(void *ptr)
void mbed_stats_heap_get(mbed_stats_heap_t *stats) void mbed_stats_heap_get(mbed_stats_heap_t *stats)
{ {
#if MBED_HEAP_STATS_ENABLED #if MBED_HEAP_STATS_ENABLED
extern uint32_t mbed_heap_size; extern uint32_t mbed_heap_size_total;
heap_stats.reserved_size = mbed_heap_size; heap_stats.reserved_size = mbed_heap_size_total;
#if defined(MBED_SPLIT_HEAP)
extern uint32_t mbed_heap_size_0;
heap_stats.reserved_size += mbed_heap_size_0;
#endif
malloc_stats_mutex->lock(); malloc_stats_mutex->lock();
memcpy(stats, &heap_stats, sizeof(mbed_stats_heap_t)); memcpy(stats, &heap_stats, sizeof(mbed_stats_heap_t));

1
platform/source/mbed_retarget.cpp
View File

@ -119,6 +119,7 @@ extern const char __stderr_name[] = "/stderr";
unsigned char *mbed_heap_start = 0; unsigned char *mbed_heap_start = 0;
uint32_t mbed_heap_size = 0; uint32_t mbed_heap_size = 0;
uint32_t mbed_heap_size_total = 0;
#if defined(MBED_SPLIT_HEAP) #if defined(MBED_SPLIT_HEAP)
unsigned char *mbed_heap_start_0 = 0; unsigned char *mbed_heap_start_0 = 0;

4
platform/source/mbed_sdk_boot.c
View File

@ -174,9 +174,13 @@ void software_init_hook(void)
mbed_heap_size = (uint32_t) &__mbed_krbs_start - (uint32_t) &__mbed_sbrk_start; mbed_heap_size = (uint32_t) &__mbed_krbs_start - (uint32_t) &__mbed_sbrk_start;
mbed_heap_start_0 = (unsigned char *) &__mbed_sbrk_start_0; mbed_heap_start_0 = (unsigned char *) &__mbed_sbrk_start_0;
mbed_heap_size_0 = (uint32_t) &__mbed_krbs_start_0 - (uint32_t) &__mbed_sbrk_start_0; mbed_heap_size_0 = (uint32_t) &__mbed_krbs_start_0 - (uint32_t) &__mbed_sbrk_start_0;
mbed_heap_size_total = mbed_heap_size + mbed_heap_size_0;
#else #else
mbed_heap_start = (unsigned char *) &__end__; mbed_heap_start = (unsigned char *) &__end__;
mbed_heap_size = (uint32_t) &__HeapLimit - (uint32_t) &__end__; mbed_heap_size = (uint32_t) &__HeapLimit - (uint32_t) &__end__;
mbed_heap_size_total = mbed_heap_size;
#endif #endif
mbed_init(); mbed_init();