Mirrors_Framework/libmetal
1
0
Fork 0
mirror of https://github.com/OpenAMP/libmetal.git synced 2026-09-29 14:24:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "lib: system: freertos: mutex: change to use atomic_int instead of freertos construct"

Browse Source 
Re-enable the use of FreeRTOS mutex to take advantage of the
FreeRTOS priority-based preemptive scheduling policy.

This reverts commit 10a0d5be4a.

Fix checkpatch complaints, associated to the patch revert. Initial
patch did not respect the new coding rules.

Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
This commit is contained in:
Arnaud Pouliquen
2021-10-22 15:11:56 +02:00
committed by Arnaud Pouliquen
parent 5d67c82cef
commit 1a38d78f5c
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/system/freertos/mutex.h
+20 -24
View File
@@ -16,24 +16,24 @@
#ifndef __METAL_FREERTOS_MUTEX__H__
#define __METAL_FREERTOS_MUTEX__H__
#include <metal/atomic.h>
#include <metal/assert.h>
#include "FreeRTOS.h"
#include "semphr.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef struct {
atomic_int v;
SemaphoreHandle_t m;
} metal_mutex_t;
#define METAL_MUTEX_UNLOCKED 0
#define METAL_MUTEX_LOCKED 1
/*
* METAL_MUTEX_INIT - used for initializing an mutex element in a static struct
* or global
*/
#define METAL_MUTEX_INIT(m) { ATOMIC_VAR_INIT(METAL_MUTEX_UNLOCKED) }
#define METAL_MUTEX_INIT(m) { NULL }
/*
* METAL_MUTEX_DEFINE - used for defining and initializing a global or
* static singleton mutex
@@ -42,44 +42,40 @@ typedef struct {
static inline void __metal_mutex_init(metal_mutex_t *mutex)
{
atomic_store(&mutex->v, METAL_MUTEX_UNLOCKED);
metal_assert(mutex);
mutex->m = xSemaphoreCreateMutex();
metal_assert(mutex->m);
}
static inline void __metal_mutex_deinit(metal_mutex_t *mutex)
{
(void)mutex;
metal_assert(mutex && mutex->m);
vSemaphoreDelete(mutex->m);
mutex->m = NULL;
}
static inline int __metal_mutex_try_acquire(metal_mutex_t *mutex)
{
int unlocked = METAL_MUTEX_UNLOCKED;
if (atomic_compare_exchange_strong(&mutex->v, &unlocked,
METAL_MUTEX_LOCKED)) {
return 1; /* acquired */
} else {
return 0; /* not acquired */
}
metal_assert(mutex && mutex->m);
return xSemaphoreTake(mutex->m, (TickType_t)0);
}
static inline void __metal_mutex_acquire(metal_mutex_t *mutex)
{
int unlocked = METAL_MUTEX_UNLOCKED;
while (!atomic_compare_exchange_weak(&mutex->v, &unlocked,
METAL_MUTEX_LOCKED)) {
;
}
metal_assert(mutex && mutex->m);
xSemaphoreTake(mutex->m, portMAX_DELAY);
}
static inline void __metal_mutex_release(metal_mutex_t *mutex)
{
atomic_store(&mutex->v, METAL_MUTEX_UNLOCKED);
metal_assert(mutex && mutex->m);
xSemaphoreGive(mutex->m);
}
static inline int __metal_mutex_is_acquired(metal_mutex_t *mutex)
{
return atomic_load(&mutex->v);
metal_assert(mutex && mutex->m);
return (!xSemaphoreGetMutexHolder(mutex->m)) ? 0 : 1;
}
#ifdef __cplusplus