From 9e05eaaf91c2596521e29b90ffa9adf3114c3b93 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Fri, 28 Jan 2011 20:11:32 +0100 Subject: Proper mutex usage, and protecting malloc and sbrk using them. Also showing this into the demo. --- os/src/sbrk.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'os/src/sbrk.c') diff --git a/os/src/sbrk.c b/os/src/sbrk.c index df196f0..ac8649c 100644 --- a/os/src/sbrk.c +++ b/os/src/sbrk.c @@ -17,25 +17,19 @@ extern uintptr_t __stack_start; /* Low-level bulk RAM allocator -- used by Newlib's Malloc */ static void *heap_end = (void *) &__heap_start; -#define USE_SBRK_MUTEX 0 - -#if USE_SBRK_MUTEX -static xSemaphoreHandle sbrk_sem; +static xSemaphoreHandle sbrk_sem = NULL; __attribute__((constructor)) static void sbrk_init() { - DBGOUT("Creating Mutex..."); sbrk_sem = xSemaphoreCreateMutex(); } -#endif void *_sbrk_r(struct _reent *ptr, ptrdiff_t incr) { void *prev_heap_end, *next_heap_end, *ret; void *stack_min = (void *) &__stack_start; - -#if USE_SBRK_MUTEX - xSemaphoreTake(sbrk_sem, portMAX_DELAY); -#endif + + if (sbrk_sem) + xSemaphoreTake(sbrk_sem, portMAX_DELAY); prev_heap_end = heap_end; @@ -51,9 +45,8 @@ void *_sbrk_r(struct _reent *ptr, ptrdiff_t incr) ret = (void *)prev_heap_end; } -#if USE_SBRK_MUTEX - xSemaphoreGive(sbrk_sem); -#endif + if (sbrk_sem) + xSemaphoreGive(sbrk_sem); return ret; } -- cgit v1.2.3