Skip to content

mutex: change the libmetal nuttx mutex to recursive mutex #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CV-Bowen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

mutex: change the libmetal nuttx mutex to recursive mutex #352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions lib/system/nuttx/mutex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,47 +22,47 @@
extern "C" {
#endif

typedef mutex_t metal_mutex_t;
typedef rmutex_t metal_mutex_t;

/*
* METAL_MUTEX_INIT - used for initializing an mutex element in a static struct
* or global
*/
#define METAL_MUTEX_INIT(m) NXMUTEX_INITIALIZER
#define METAL_MUTEX_INIT(m) NXRMUTEX_INITIALIZER
/*
* METAL_MUTEX_DEFINE - used for defining and initializing a global or
* static singleton mutex
*/
#define METAL_MUTEX_DEFINE(m) metal_mutex_t m = NXMUTEX_INITIALIZER
#define METAL_MUTEX_DEFINE(m) metal_mutex_t m = NXRMUTEX_INITIALIZER

static inline void __metal_mutex_init(metal_mutex_t *mutex)
{
nxmutex_init(mutex);
nxrmutex_init(mutex);
}

static inline void __metal_mutex_deinit(metal_mutex_t *mutex)
{
nxmutex_destroy(mutex);
nxrmutex_destroy(mutex);
}

static inline int __metal_mutex_try_acquire(metal_mutex_t *mutex)
{
return nxmutex_trylock(mutex);
return nxrmutex_trylock(mutex);
}

static inline void __metal_mutex_acquire(metal_mutex_t *mutex)
{
nxmutex_lock(mutex);
nxrmutex_lock(mutex);
}

static inline void __metal_mutex_release(metal_mutex_t *mutex)
{
nxmutex_unlock(mutex);
nxrmutex_unlock(mutex);
}

static inline int __metal_mutex_is_acquired(metal_mutex_t *mutex)
{
return nxmutex_is_locked(mutex);
return nxrmutex_is_locked(mutex);
}

#ifdef __cplusplus
Expand Down