From 4c49427bf3048a12569f9890188c4be33e082838 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Mon, 20 Jun 2022 10:47:46 -0700 Subject: [PATCH] Fix auto_init_recursive_mutex definition for C++ (#875) Co-authored-by: Graham Sanderson --- src/common/pico_sync/include/pico/mutex.h | 2 +- test/kitchen_sink/kitchen_sink.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/common/pico_sync/include/pico/mutex.h b/src/common/pico_sync/include/pico/mutex.h index e834dc5..ca93760 100644 --- a/src/common/pico_sync/include/pico/mutex.h +++ b/src/common/pico_sync/include/pico/mutex.h @@ -289,7 +289,7 @@ static inline bool recursive_mutex_is_initialized(recursive_mutex_t *mtx) { * * But the initialization of the mutex is performed automatically during runtime initialization */ -#define auto_init_recursive_mutex(name) static __attribute__((section(".mutex_array"))) recursive_mutex_t name = { .core.spin_lock = (spin_lock_t *)1 /* marker for runtime_init */ } +#define auto_init_recursive_mutex(name) static __attribute__((section(".mutex_array"))) recursive_mutex_t name = { .core = { .spin_lock = (spin_lock_t *)1 /* marker for runtime_init */ }, .owner = 0, .enter_count = 0 } #ifdef __cplusplus } diff --git a/test/kitchen_sink/kitchen_sink.c b/test/kitchen_sink/kitchen_sink.c index f61ece3..62fe03a 100644 --- a/test/kitchen_sink/kitchen_sink.c +++ b/test/kitchen_sink/kitchen_sink.c @@ -110,6 +110,9 @@ __force_inline int something_inlined(int x) { return x * 2; } +auto_init_mutex(mutex); +auto_init_recursive_mutex(recursive_mutex); + int main(void) { spiggle(); @@ -118,6 +121,12 @@ int main(void) { printf("HI %d\n", something_inlined((int)time_us_32())); puts("Hello Everything!"); puts("Hello Everything2!"); + + hard_assert(mutex_try_enter(&mutex, NULL)); + hard_assert(!mutex_try_enter(&mutex, NULL)); + hard_assert(recursive_mutex_try_enter(&recursive_mutex, NULL)); + hard_assert(recursive_mutex_try_enter(&recursive_mutex, NULL)); // this should compile as we are Cortex M0+ __asm volatile("SVC #3"); + }