Skip to content

[pthreads] Fix pthread_cond_timedwait lacks timeout wakeup #10451

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

Merged
merged 1 commit into from
Jul 25, 2025
Merged

[pthreads] Fix pthread_cond_timedwait lacks timeout wakeup #10451

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
16 changes: 5 additions & 11 deletions components/libc/posix/pthreads/pthread_cond.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,30 +367,27 @@ rt_err_t _pthread_cond_timedwait(pthread_cond_t *cond,
}

{
register rt_base_t temp;
struct rt_thread *thread;

/* parameter check */
RT_ASSERT(sem != RT_NULL);
RT_ASSERT(rt_object_get_type(&sem->parent.parent) == RT_Object_Class_Semaphore);

/* disable interrupt */
temp = rt_hw_interrupt_disable();
rt_enter_critical();

if (sem->value > 0)
{
/* semaphore is available */
sem->value--;

/* enable interrupt */
rt_hw_interrupt_enable(temp);
rt_exit_critical();
}
else
{
/* no waiting, return with timeout */
if (time == 0)
{
rt_hw_interrupt_enable(temp);
rt_exit_critical();

return -RT_ETIMEOUT;
}
Expand Down Expand Up @@ -434,11 +431,8 @@ rt_err_t _pthread_cond_timedwait(pthread_cond_t *cond,
return -RT_ERROR;
}

/* enable interrupt */
rt_hw_interrupt_enable(temp);

/* do schedule */
rt_schedule();
/* exit critical and do schedule */
rt_exit_critical();

result = thread->error;

Expand Down
Loading