diff options
Diffstat (limited to 'os/src/malloc.c')
-rw-r--r-- | os/src/malloc.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/os/src/malloc.c b/os/src/malloc.c index 0906cc0..a24a87f 100644 --- a/os/src/malloc.c +++ b/os/src/malloc.c @@ -2,7 +2,18 @@ #include <malloc.h> #include <osdebug.h> +static xSemaphoreHandle malloc_sem = NULL; + +__attribute__((constructor)) static void malloc_init() { + malloc_sem = xSemaphoreCreateMutex(); +} + void * malloc(size_t size) { - DBGOUT("malloc(%u)\r\n", size); - return _malloc_r(_impure_ptr, size); + void * ptr; + + if (malloc_sem) + xSemaphoreTake(malloc_sem, portMAX_DELAY); + ptr =_malloc_r(_impure_ptr, size); + if (malloc_sem) + xSemaphoreGive(malloc_sem); } |