alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-16 06:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

heap: Update target and host tests after incorporation of the new TLSF implementation

Browse Source 
- update the target and host tests to consider the new TLSF api and the metadata size
  only when the target is not using the rom implementation of the TLSF
This commit is contained in:
Guillaume Souchere
2022-10-13 10:05:53 +02:00
parent 7de6565722
commit 6f11d0f297
2 changed files with 65 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
components/heap/test_apps/main/test_runtime_heap_reg.c
View File

@@ -15,18 +15,16 @@
#include "esp_system.h"
#include "heap_memory_layout.h"
#include "../tlsf/tlsf.h"
extern void set_leak_threshold(int threshold);
/* NOTE: This is not a well-formed unit test, it leaks memory */
TEST_CASE("Allocate new heap at runtime", "[heap]")
{
// 84 bytes of overhead to account for multi_heap structs and eventual
// poisoning bytes + size of control_t from tlsf
const size_t HEAP_OVERHEAD_MAX = tlsf_size() + 84;
const size_t MIN_HEAP_SIZE = HEAP_OVERHEAD_MAX + tlsf_block_size_min();
const size_t BUF_SZ = MIN_HEAP_SIZE;
/* The value of the heap overhead is calculated for the worst case scenario
* where the tlsf has a size of metadata fixed at runtime.
*/
const size_t HEAP_OVERHEAD_MAX = 3248;
const size_t BUF_SZ = 3500;
void *buffer = malloc(BUF_SZ);
TEST_ASSERT_NOT_NULL(buffer);
@@ -46,12 +44,8 @@ TEST_CASE("Allocate new heap at runtime", "[heap]")
*/
TEST_CASE("Allocate new heap with new capability", "[heap]")
{
// 84 bytes of overhead to account for multi_heap structs and eventual
// poisoning bytes + size of control_t from tlsf
const size_t HEAP_OVERHEAD = tlsf_size() + 84;
const size_t MIN_HEAP_SIZE = HEAP_OVERHEAD + tlsf_block_size_min();
const size_t BUF_SZ = MIN_HEAP_SIZE;
const size_t ALLOC_SZ = tlsf_block_size_min();
const size_t BUF_SZ = 3500;
const size_t ALLOC_SZ = 64;
const uint32_t MALLOC_CAP_INVENTED = (1 << 30); /* this must be unused in esp_heap_caps.h */
@@ -67,7 +61,7 @@ TEST_CASE("Allocate new heap with new capability", "[heap]")
TEST_ASSERT_NOT_NULL( heap_caps_malloc(ALLOC_SZ, MALLOC_CAP_INVENTED) );
// set the leak threshold to a bigger value as this test leaks memory
set_leak_threshold(-3000);
set_leak_threshold(-4000);
}
/* NOTE: This is not a well-formed unit test.
@@ -76,8 +70,11 @@ TEST_CASE("Allocate new heap with new capability", "[heap]")
TEST_CASE("Add .bss memory to heap region runtime", "[heap]")
{
/* The value of the heap overhead is calculated for the worst case scenario
* where the tlsf has a size of metadata fixed at runtime.
*/
#define HEAP_OVERHEAD_MAX 3248
#define BUF_SZ 3260
#define BUF_SZ 3500
static uint8_t s_buffer[BUF_SZ];
printf("s_buffer start %08x end %08x\n", (intptr_t)s_buffer, (intptr_t)s_buffer + BUF_SZ);