patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

Revert "sys_sem: add a for-loop-like macro similar to spinlocks"

Browse source 
This reverts commit 3c6fdf27d0.

This PR:
https://github.com/zephyrproject-rtos/zephyr/pull/71718
introduced a regression breaking CI:
https://github.com/zephyrproject-rtos/zephyr/issues/71814
Let's just revert it until a better fix is done.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
This commit is contained in:
Alberto Escolar Piedras 2024-04-23 16:04:11 +02:00 committed by Anas Nashif
parent c217703830
commit f9d350f29e
1 changed files with 0 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
include/zephyr/sys/sem.h
View file

@ -23,7 +23,6 @@
#include <zephyr/sys/atomic.h> #include <zephyr/sys/atomic.h>
#include <zephyr/types.h> #include <zephyr/types.h>
#include <zephyr/sys/iterable_sections.h> #include <zephyr/sys/iterable_sections.h>
#include <zephyr/sys/__assert.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -139,82 +138,6 @@ int sys_sem_take(struct sys_sem *sem, k_timeout_t timeout);
*/ */
unsigned int sys_sem_count_get(struct sys_sem *sem); unsigned int sys_sem_count_get(struct sys_sem *sem);
/**
* @cond INTERNAL_HIDDEN
*/
#if defined(__GNUC__)
static ALWAYS_INLINE void z_sys_sem_lock_onexit(__maybe_unused int *rc)
{
__ASSERT(*rc == 1, "SYS_SEM_LOCK exited with goto, break or return, "
"use SYS_SEM_LOCK_BREAK instead.");
}
#define SYS_SEM_LOCK_ONEXIT __attribute__((__cleanup__(z_sys_sem_lock_onexit)))
#else
#define SYS_SEM_LOCK_ONEXIT
#endif
/**
* INTERNAL_HIDDEN @endcond
*/
/**
* @brief Leaves a code block guarded with @ref SYS_SEM_LOCK after releasing the
* lock.
*
* See @ref SYS_SEM_LOCK for details.
*/
#define SYS_SEM_LOCK_BREAK continue
/**
* @brief Guards a code block with the given sys_sem, automatically acquiring
* the semaphore before executing the code block. The semaphore will be
* released either when reaching the end of the code block or when leaving the
* block with @ref SYS_SEM_LOCK_BREAK.
*
* @details Example usage:
*
* @code{.c}
* SYS_SEM_LOCK(&sem) {
*
* ...execute statements with the semaphore held...
*
* if (some_condition) {
* ...release the lock and leave the guarded section prematurely:
* SYS_SEM_LOCK_BREAK;
* }
*
* ...execute statements with the lock held...
*
* }
* @endcode
*
* Behind the scenes this pattern expands to a for-loop whose body is executed
* exactly once:
*
* @code{.c}
* for (sys_sem_take(&sem, K_FOREVER); ...; sys_sem_give(&sem)) {
* ...
* }
* @endcode
*
* @warning The code block must execute to its end or be left by calling
* @ref SYS_SEM_LOCK_BREAK. Otherwise, e.g. if exiting the block with a break,
* goto or return statement, the semaphore will not be released on exit.
*
* @param sem Semaphore (@ref sys_sem) used to guard the enclosed code block.
*/
#define SYS_SEM_LOCK(sem) \
for (int __rc SYS_SEM_LOCK_ONEXIT = sys_sem_take((sem), K_FOREVER); ({ \
__ASSERT(__rc >= 0, "Failed to take sem: %d", __rc); \
__rc == 0; \
}); \
({ \
__rc = sys_sem_give((sem)); \
__ASSERT(__rc == 0, "Failed to give sem: %d", __rc); \
}), \
__rc = 1)
/** /**
* @} * @}
*/ */