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

kernel: spinlock: k_spin_is_locked introduction

Browse source 
Currently spinlock internals are directly accessed from the tests.
This way the test becomes bound to the particular spinlock implementation.
To remove this unnecessary dependency the distinct API to check if spinlock
is locked is introduced.

k_spin_is_locked should be used for the spinlock testing only,
so the scope of this API is intentionally restricted.

Signed-off-by: Alexander Razinkov <alexander.razinkov@syntacore.com>
This commit is contained in:
Alexander Razinkov 2023-08-30 18:05:55 +03:00 committed by Carles Cufí
parent 22fbd73fab
commit 9ae9df8b6f
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/zephyr/spinlock.h
View file

@ -265,6 +265,20 @@ static ALWAYS_INLINE void k_spin_unlock(struct k_spinlock *l,
* @cond INTERNAL_HIDDEN
*/
#if defined(CONFIG_SMP) && defined(CONFIG_TEST)
/*
* @brief Checks if spinlock is held by some CPU, including the local CPU.
* This API shouldn't be used outside the tests for spinlock
*
* @param l A pointer to the spinlock
* @retval true - if spinlock is held by some CPU; false - otherwise
*/
static ALWAYS_INLINE bool z_spin_is_locked(struct k_spinlock *l)
{
return l->locked;
}
#endif
/* Internal function: releases the lock, but leaves local interrupts disabled */
static ALWAYS_INLINE void k_spin_release(struct k_spinlock *l)
{

10
tests/kernel/spinlock/src/main.c
View file

@ -44,15 +44,15 @@ ZTEST(spinlock, test_spinlock_basic)
k_spinlock_key_t key;
static struct k_spinlock l;
zassert_true(!l.locked, "Spinlock initialized to locked");
zassert_true(!z_spin_is_locked(&l), "Spinlock initialized to locked");
key = k_spin_lock(&l);
zassert_true(l.locked, "Spinlock failed to lock");
zassert_true(z_spin_is_locked(&l), "Spinlock failed to lock");
k_spin_unlock(&l, key);
zassert_true(!l.locked, "Spinlock failed to unlock");
zassert_true(!z_spin_is_locked(&l), "Spinlock failed to unlock");
}
void bounce_once(int id, bool trylock)
@ -164,7 +164,7 @@ ZTEST(spinlock, test_spinlock_mutual_exclusion)
key = k_spin_lock(&lock_runtime);
zassert_true(lock_runtime.locked, "Spinlock failed to lock");
zassert_true(z_spin_is_locked(&lock_runtime), "Spinlock failed to lock");
/* check irq has not locked */
zassert_true(arch_irq_unlocked(key.key),
@ -184,7 +184,7 @@ ZTEST(spinlock, test_spinlock_mutual_exclusion)
k_spin_unlock(&lock_runtime, key);
zassert_true(!lock_runtime.locked, "Spinlock failed to unlock");
zassert_true(!z_spin_is_locked(&lock_runtime), "Spinlock failed to unlock");
}
void trylock_fn(void *p1, void *p2, void *p3)