Add logic to make external RAM usable with malloc()

components/heap/test/test_malloc.c

@@ -15,32 +15,42 @@
 #include "soc/uart_reg.h"
 #include "soc/dport_reg.h"
 #include "soc/io_mux_reg.h"
+#include "esp_heap_caps.h"
 
 #include "esp_panic.h"
+#include "sdkconfig.h"
+
+
+static int **allocatedMem;
+static int noAllocated;
+
 
 static int tryAllocMem() {
-    int **mem;
-    int i, noAllocated, j;
+    int i, j;
+    const int allocateMaxK=1024*5; //try to allocate a max of 5MiB
 
-    mem=malloc(sizeof(int *)*1024);
-    if (!mem) return 0;
+    allocatedMem=malloc(sizeof(int *)*allocateMaxK);
+    if (!allocatedMem) return 0;
 
-    for (i=0; i<1024; i++) {
-        mem[i]=malloc(1024);
-        if (mem[i]==NULL) break;
-        for (j=0; j<1024/4; j++) mem[i][j]=(0xdeadbeef);
+    for (i=0; i<allocateMaxK; i++) {
+        allocatedMem[i]=malloc(1024);
+        if (allocatedMem[i]==NULL) break;
+        for (j=0; j<1024/4; j++) allocatedMem[i][j]=(0xdeadbeef);
     }
-
     noAllocated=i;
+    return i;
+}
 
+
+static void tryAllocMemFree() {
+    int i, j;
     for (i=0; i<noAllocated; i++) {
         for (j=0; j<1024/4; j++) {
-            TEST_ASSERT(mem[i][j]==(0xdeadbeef));
+            TEST_ASSERT(allocatedMem[i][j]==(0xdeadbeef));
         }
-        free(mem[i]);
+        free(allocatedMem[i]);
     }
-    free(mem);
-    return noAllocated;
+    free(allocatedMem);
 }
 
 
@@ -48,8 +58,33 @@ TEST_CASE("Malloc/overwrite, then free all available DRAM", "[heap]")
 {
     int m1=0, m2=0;
     m1=tryAllocMem();
+    tryAllocMemFree();
     m2=tryAllocMem();
+    tryAllocMemFree();
     printf("Could allocate %dK on first try, %dK on 2nd try.\n", m1, m2);
     TEST_ASSERT(m1==m2);
 }
 
+
+#if CONFIG_SPIRAM_USE_MALLOC
+
+#if (CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL > 1024)
+TEST_CASE("Check if reserved DMA pool still can allocate even when malloc()'ed memory is exhausted", "[heap]")
+{
+    char** dmaMem=malloc(sizeof(char*)*512);
+    assert(dmaMem);
+    int m=tryAllocMem();
+    int i=0;
+    for (i=0; i<512; i++) {
+        dmaMem[i]=heap_caps_malloc(1024, MALLOC_CAP_DMA);
+        if (dmaMem[i]==NULL) break;
+    }
+    for (int j=0; j<i; j++) free(dmaMem[j]);
+    free(dmaMem);
+    tryAllocMemFree();
+    printf("Could allocate %dK of DMA memory after allocating all of %dK of normal memory.\n", i, m);
+    TEST_ASSERT(i);
+}
+#endif
+
+#endif