michaelh/zephyr
1
0
Fork 0
Code Releases Activity

libc/common: Don't use malloc mutex when CONFIG_MULTITHREADING=n

Browse source 
When multithreading is disabled, the whole mutex infrastructure isn't
available. The common malloc code wasn't checking for this case which
caused build failures.

Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Detlev Zundel dzu@member.fsf.org
This commit is contained in:
Keith Packard 2023-09-12 08:16:49 -07:00 • committed by Anas Nashif
commit ae92df1e4a
1 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

46
lib/libc/common/source/stdlib/malloc.c
View file

@ -11,7 +11,9 @@
#include <zephyr/sys/math_extras.h> #include <zephyr/sys/math_extras.h>
#include <string.h> #include <string.h>
#include <zephyr/app_memory/app_memdomain.h> #include <zephyr/app_memory/app_memdomain.h>
#ifdef CONFIG_MULTITHREADING
#include <zephyr/sys/mutex.h> #include <zephyr/sys/mutex.h>
#endif
#include <zephyr/sys/sys_heap.h> #include <zephyr/sys/sys_heap.h>
#include <zephyr/sys/libc-hooks.h> #include <zephyr/sys/libc-hooks.h>
#include <zephyr/types.h> #include <zephyr/types.h>
@ -113,14 +115,31 @@ extern char _heap_sentry[];
# endif /* else ALLOCATE_HEAP_AT_STARTUP */ # endif /* else ALLOCATE_HEAP_AT_STARTUP */
POOL_SECTION static struct sys_heap z_malloc_heap; POOL_SECTION static struct sys_heap z_malloc_heap;
#ifdef CONFIG_MULTITHREADING
MALLOC_SECTION SYS_MUTEX_DEFINE(z_malloc_heap_mutex); MALLOC_SECTION SYS_MUTEX_DEFINE(z_malloc_heap_mutex);
void *malloc(size_t size) static inline void
{ malloc_lock(void) {
int lock_ret; int lock_ret;
lock_ret = sys_mutex_lock(&z_malloc_heap_mutex, K_FOREVER); lock_ret = sys_mutex_lock(&z_malloc_heap_mutex, K_FOREVER);
__ASSERT_NO_MSG(lock_ret == 0); __ASSERT_NO_MSG(lock_ret == 0);
}
static inline void
malloc_unlock(void)
{
(void) sys_mutex_unlock(&z_malloc_heap_mutex);
}
#else
#define malloc_lock()
#define malloc_unlock()
#endif
void *malloc(size_t size)
{
malloc_lock();
void *ret = sys_heap_aligned_alloc(&z_malloc_heap, void *ret = sys_heap_aligned_alloc(&z_malloc_heap,
__alignof__(z_max_align_t), __alignof__(z_max_align_t),
@ -129,17 +148,14 @@ void *malloc(size_t size)
errno = ENOMEM; errno = ENOMEM;
} }
(void) sys_mutex_unlock(&z_malloc_heap_mutex); malloc_unlock();
return ret; return ret;
} }
void *aligned_alloc(size_t alignment, size_t size) void *aligned_alloc(size_t alignment, size_t size)
{ {
int lock_ret; malloc_lock();
lock_ret = sys_mutex_lock(&z_malloc_heap_mutex, K_FOREVER);
__ASSERT_NO_MSG(lock_ret == 0);
void *ret = sys_heap_aligned_alloc(&z_malloc_heap, void *ret = sys_heap_aligned_alloc(&z_malloc_heap,
alignment, alignment,
@ -148,7 +164,7 @@ void *aligned_alloc(size_t alignment, size_t size)
errno = ENOMEM; errno = ENOMEM;
} }
(void) sys_mutex_unlock(&z_malloc_heap_mutex); malloc_unlock();
return ret; return ret;
} }
@ -222,10 +238,7 @@ static int malloc_prepare(void)
void *realloc(void *ptr, size_t requested_size) void *realloc(void *ptr, size_t requested_size)
{ {
int lock_ret; malloc_lock();
lock_ret = sys_mutex_lock(&z_malloc_heap_mutex, K_FOREVER);
__ASSERT_NO_MSG(lock_ret == 0);
void *ret = sys_heap_aligned_realloc(&z_malloc_heap, ptr, void *ret = sys_heap_aligned_realloc(&z_malloc_heap, ptr,
__alignof__(z_max_align_t), __alignof__(z_max_align_t),
@ -235,19 +248,16 @@ void *realloc(void *ptr, size_t requested_size)
errno = ENOMEM; errno = ENOMEM;
} }
(void) sys_mutex_unlock(&z_malloc_heap_mutex); malloc_unlock();
return ret; return ret;
} }
void free(void *ptr) void free(void *ptr)
{ {
int lock_ret; malloc_lock();
lock_ret = sys_mutex_lock(&z_malloc_heap_mutex, K_FOREVER);
__ASSERT_NO_MSG(lock_ret == 0);
sys_heap_free(&z_malloc_heap, ptr); sys_heap_free(&z_malloc_heap, ptr);
(void) sys_mutex_unlock(&z_malloc_heap_mutex); malloc_unlock();
} }
SYS_INIT(malloc_prepare, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); SYS_INIT(malloc_prepare, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);