heap: Refactor heap regions/capabilities out of FreeRTOS

Remove tagged heap API, rename caps_xxx to heap_caps_xxx

Also includes additional heap_caps_xxx inspection functions.

components/esp32/cpu_start.c

@@ -40,7 +40,7 @@
 
 #include "tcpip_adapter.h"
 
-#include "esp_heap_alloc_caps.h"
+#include "esp_heap_caps.h"
 #include "sdkconfig.h"
 #include "esp_system.h"
 #include "esp_spi_flash.h"
@@ -167,8 +167,7 @@ void IRAM_ATTR call_start_cpu0()
        memory also used by the ROM. Starting the app cpu will let its ROM initialize that memory,
        corrupting those linked lists. Initializing the allocator *after* the app cpu has booted
        works around this problem. */
-    heap_alloc_caps_init();
-
+    heap_caps_init();
 
     ESP_EARLY_LOGI(TAG, "Pro cpu start user code");
     start_cpu0();
@@ -336,7 +335,7 @@ static void main_task(void* args)
     }
 #endif
     //Enable allocation in region where the startup stacks were located.
-    heap_alloc_enable_nonos_stack_tag();
+    heap_caps_enable_nonos_stack_heaps();
     app_main();
     vTaskDelete(NULL);
 }

components/esp32/include/esp_system.h

@@ -95,6 +95,13 @@ uint32_t esp_get_free_heap_size(void);
   */
 uint32_t system_get_free_heap_size(void)  __attribute__ ((deprecated));
 
+/**
+  * @brief Get the minimum heap that has ever been available
+  *
+  * @return Minimum free heap ever available
+  */
+uint32_t esp_get_minimum_free_heap_size( void );
+
 /**
  * @brief  Get one random 32-bit word from hardware RNG
  *

components/esp32/ld/esp32.common.ld

@@ -83,12 +83,12 @@ SECTIONS
     _iram_text_start = ABSOLUTE(.);
     *(.iram1 .iram1.*)
     *libfreertos.a:(.literal .text .literal.* .text.*)
-    *libheap.a:(.literal .text .literal.* .text.*)
+    *libheap.a:multi_heap.o(.literal .text .literal.* .text.*)
     *libesp32.a:panic.o(.literal .text .literal.* .text.*)
     *libesp32.a:core_dump.o(.literal .text .literal.* .text.*)
-    *libesp32.a:heap_alloc_caps.o(.literal .text .literal.* .text.*)
     *libapp_trace.a:(.literal .text .literal.* .text.*)
     *libxtensa-debug-module.a:eri.o(.literal .text .literal.* .text.*)
+    *libesp32.a:app_trace.o(.literal .text .literal.* .text.*)
     *libphy.a:(.literal .text .literal.* .text.*)
     *librtc.a:(.literal .text .literal.* .text.*)
     *libsoc.a:(.literal .text .literal.* .text.*)
@@ -115,6 +115,7 @@ SECTIONS
     *libesp32.a:panic.o(.rodata .rodata.*)
     *libphy.a:(.rodata .rodata.*)
     *libapp_trace.a:(.rodata .rodata.*)
+    *libheap.a:multi_heap.o(.rodata .rodata.*)
     _data_end = ABSOLUTE(.);
     . = ALIGN(4);
   } >dram0_0_seg

components/esp32/system_api.c

@@ -33,6 +33,7 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "freertos/xtensa_api.h"
+#include "esp_heap_caps.h"
 
 static const char* TAG = "system_api";
 
@@ -330,9 +331,19 @@ void IRAM_ATTR esp_restart_noos()
 
 void system_restart(void) __attribute__((alias("esp_restart")));
 
-uint32_t esp_get_free_heap_size(void)
+void system_restore(void)
 {
-    return xPortGetFreeHeapSize();
+    esp_wifi_restore();
+}
+
+uint32_t esp_get_free_heap_size( void )
+{
+    return heap_caps_get_free_size( MALLOC_CAP_8BIT );
+}
+
+uint32_t esp_get_minimum_free_heap_size( void )
+{
+    return heap_caps_get_minimum_free_size( MALLOC_CAP_8BIT );
 }
 
 uint32_t system_get_free_heap_size(void) __attribute__((alias("esp_get_free_heap_size")));

components/esp32/test/test_malloc_caps.c

@@ -1,64 +0,0 @@
-/*
- Tests for the capabilities-based memory allocator.
-*/
-
-#include <esp_types.h>
-#include <stdio.h>
-#include "unity.h"
-#include "rom/ets_sys.h"
-#include "esp_heap_alloc_caps.h"
-#include <stdlib.h>
-
-
-TEST_CASE("Capabilities allocator test", "[esp32]")
-{
-    char *m1, *m2[10];
-    int x;
-    size_t free8start, free32start, free8, free32;
-    free8start=xPortGetFreeHeapSizeCaps(MALLOC_CAP_8BIT);
-    free32start=xPortGetFreeHeapSizeCaps(MALLOC_CAP_32BIT);
-    printf("Free 8bit-capable memory: %dK, 32-bit capable memory %dK\n", free8start, free32start);
-    TEST_ASSERT(free32start>free8start);
-    printf("Allocating 10K of 8-bit capable RAM\n");
-    m1=pvPortMallocCaps(10*1024, MALLOC_CAP_8BIT);
-    printf("--> %p\n", m1);
-    free8=xPortGetFreeHeapSizeCaps(MALLOC_CAP_8BIT);
-    free32=xPortGetFreeHeapSizeCaps(MALLOC_CAP_32BIT);
-    printf("Free 8bit-capable memory: %dK, 32-bit capable memory %dK\n", free8, free32);
-    //Both should have gone down by 10K; 8bit capable ram is also 32-bit capable
-    TEST_ASSERT(free8<(free8start-10*1024));
-    TEST_ASSERT(free32<(free32start-10*1024));
-    //Assume we got DRAM back
-    TEST_ASSERT((((int)m1)&0xFF000000)==0x3F000000);
-    free(m1);
-    printf("Freeing; allocating 10K of 32K-capable RAM\n");
-    m1=pvPortMallocCaps(10*1024, MALLOC_CAP_32BIT);
-    printf("--> %p\n", m1);
-    free8=xPortGetFreeHeapSizeCaps(MALLOC_CAP_8BIT);
-    free32=xPortGetFreeHeapSizeCaps(MALLOC_CAP_32BIT);
-    printf("Free 8bit-capable memory: %dK, 32-bit capable memory %dK\n", free8, free32);
-    //Only 32-bit should have gone down by 10K: 32-bit isn't necessarily 8bit capable
-    TEST_ASSERT(free32<(free32start-10*1024));
-    TEST_ASSERT(free8==free8start);
-    //Assume we got IRAM back
-    TEST_ASSERT((((int)m1)&0xFF000000)==0x40000000);
-    free(m1);
-    printf("Allocating impossible caps\n");
-    m1=pvPortMallocCaps(10*1024, MALLOC_CAP_8BIT|MALLOC_CAP_EXEC);
-    printf("--> %p\n", m1);
-    TEST_ASSERT(m1==NULL);
-    printf("Testing changeover iram -> dram");
-    for (x=0; x<10; x++) {
-        m2[x]=pvPortMallocCaps(10*1024, MALLOC_CAP_32BIT);
-        printf("--> %p\n", m2[x]);
-    }
-    TEST_ASSERT((((int)m2[0])&0xFF000000)==0x40000000);
-    TEST_ASSERT((((int)m2[9])&0xFF000000)==0x3F000000);
-    printf("Test if allocating executable code still gives IRAM, even with dedicated IRAM region depleted\n");
-    m1=pvPortMallocCaps(10*1024, MALLOC_CAP_EXEC);
-    printf("--> %p\n", m1);
-    TEST_ASSERT((((int)m1)&0xFF000000)==0x40000000);
-    free(m1);
-    for (x=0; x<10; x++) free(m2[x]);
-    printf("Done.\n");
-}