Merge pull request #279 from pycom/thread_malloc

gijsio · web-flow · commit 39de84e91cf6 · 2021-07-16T14:35:43.000+02:00
thread: allocate internal mem
diff --git a/esp32/mpthreadport.c b/esp32/mpthreadport.c
@@ -171,15 +171,15 @@ void mp_thread_create_ex(void *(*entry)(void*), void *arg, size_t *stack_size, i
     // allocate TCB, stack and linked-list node (must be outside thread_mutex lock)
     if (mp_chip_revision > 0) {
         // for revision 1 devices we allocate from the internal memory of the malloc heap
-        tcb = malloc(sizeof(StaticTask_t));
+        tcb = heap_caps_malloc(sizeof(StaticTask_t), MALLOC_CAP_8BIT | MALLOC_CAP_INTERNAL);
         if (!tcb) {
             goto memory_error;
         }
-        stack = malloc(*stack_size);
+        stack = heap_caps_malloc(*stack_size, MALLOC_CAP_8BIT | MALLOC_CAP_INTERNAL);
         if (!stack) {
             goto memory_error;
         }
-        th = malloc(sizeof(thread_t));
+        th = heap_caps_malloc(sizeof(thread_t), MALLOC_CAP_8BIT | MALLOC_CAP_INTERNAL);
         if (!th) {
             goto memory_error;
         }

Original file line number	Diff line number	Diff line change
`@@ -171,15 +171,15 @@ void mp_thread_create_ex(void (entry)(void), void arg, size_t *stack_size, i`
`171`	`171`	`// allocate TCB, stack and linked-list node (must be outside thread_mutex lock)`
`172`	`172`	`if (mp_chip_revision > 0) {`
`173`	`173`	`// for revision 1 devices we allocate from the internal memory of the malloc heap`
`174`		`- tcb = malloc(sizeof(StaticTask_t));`
	`174`	`+ tcb = heap_caps_malloc(sizeof(StaticTask_t), MALLOC_CAP_8BIT \| MALLOC_CAP_INTERNAL);`
`175`	`175`	`if (!tcb) {`
`176`	`176`	`goto memory_error;`
`177`	`177`	`}`
`178`		`- stack = malloc(*stack_size);`
	`178`	`+ stack = heap_caps_malloc(*stack_size, MALLOC_CAP_8BIT \| MALLOC_CAP_INTERNAL);`
`179`	`179`	`if (!stack) {`
`180`	`180`	`goto memory_error;`
`181`	`181`	`}`
`182`		`- th = malloc(sizeof(thread_t));`
	`182`	`+ th = heap_caps_malloc(sizeof(thread_t), MALLOC_CAP_8BIT \| MALLOC_CAP_INTERNAL);`
`183`	`183`	`if (!th) {`
`184`	`184`	`goto memory_error;`
`185`	`185`	`}`