michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: Fix two k_condvar_wait() issues

Browse Source 
1. When the timeout is K_NO_WAIT, the thread should not be added
   to the wait queue as that would otherwise cause to the thread
   to wait until the next tick (which is not a no-wait situation).
2. Threads that were added to the wait queue AND did not receive
   a signal before timing out should not lock the supplied mutex.

Signed-off-by: Peter Mitsis <peter.mitsis@intel.com>
This commit is contained in:
Peter Mitsis
2026-01-12 15:33:08 -08:00
committed by Fabio Baltieri
parent c5bc58e3bd
commit 924874baef
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/condvar.c
View File

@@ -115,15 +115,23 @@ int z_impl_k_condvar_wait(struct k_condvar *condvar, struct k_mutex *mutex,
k_timeout_t timeout)
{
k_spinlock_key_t key;
int ret;
int ret = -EAGAIN;
SYS_PORT_TRACING_OBJ_FUNC_ENTER(k_condvar, wait, condvar, timeout);
if (unlikely(K_TIMEOUT_EQ(timeout, K_NO_WAIT))) {
k_mutex_unlock(mutex);
SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_condvar, wait, condvar, timeout, ret);
return ret;
}
key = k_spin_lock(&lock);
k_mutex_unlock(mutex);
ret = z_pend_curr(&lock, key, &condvar->wait_q, timeout);
k_mutex_lock(mutex, K_FOREVER);
if (ret == 0) {
k_mutex_lock(mutex, K_FOREVER);
}
SYS_PORT_TRACING_OBJ_FUNC_EXIT(k_condvar, wait, condvar, timeout, ret);