Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-22 05:42:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sched/semaphore: Fix illegal abstime.

Browse Source 
Remove CONFIG_DEBUG_FEATURES to check illegal abstime.

Signed-off-by: jiangtao16 <jiangtao16@xiaomi.com>
This commit is contained in:
jiangtao16
2025-08-14 15:45:59 +08:00
committed by Xiang Xiao
parent caafba07bc
commit 2b33168cc0
1 changed files with 37 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sched/semaphore/sem_clockwait.c
+37 -46
View File
@@ -94,7 +94,7 @@ int nxsem_clockwait(FAR sem_t *sem, clockid_t clockid,
{
FAR struct tcb_s *rtcb = this_task();
irqstate_t flags;
int ret = ERROR;
int ret = -EINVAL;
DEBUGASSERT(sem != NULL && abstime != NULL);
DEBUGASSERT(up_interrupt_context() == false);
@@ -107,55 +107,46 @@ int nxsem_clockwait(FAR sem_t *sem, clockid_t clockid,
* enabled while we are blocked waiting for the semaphore.
*/
flags = enter_critical_section();
/* Try to take the semaphore without waiting. */
ret = nxsem_trywait(sem);
if (ret == OK)
if (abstime->tv_nsec >= 0 && abstime->tv_nsec < 1000000000)
{
/* We got it! */
flags = enter_critical_section();
goto out;
/* Try to take the semaphore without waiting. */
ret = nxsem_trywait(sem);
if (ret != OK)
{
/* We will have to wait for the semaphore. Make sure that
* we were provided with a valid timeout.
*/
if (clockid == CLOCK_REALTIME)
{
wd_start_realtime(&rtcb->waitdog, abstime,
nxsem_timeout, (uintptr_t)rtcb);
}
else
{
wd_start_abstime(&rtcb->waitdog, abstime,
nxsem_timeout, (uintptr_t)rtcb);
}
/* Now perform the blocking wait. If nxsem_wait() fails, the
* negated errno value will be returned below.
*/
ret = nxsem_wait(sem);
/* Stop the watchdog timer */
wd_cancel(&rtcb->waitdog);
}
/* We can now restore interrupts and delete the watchdog */
leave_critical_section(flags);
}
/* We will have to wait for the semaphore. Make sure that we were provided
* with a valid timeout.
*/
#ifdef CONFIG_DEBUG_FEATURES
if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000)
{
ret = -EINVAL;
goto out;
}
#endif
if (clockid == CLOCK_REALTIME)
{
wd_start_realtime(&rtcb->waitdog, abstime,
nxsem_timeout, (uintptr_t)rtcb);
}
else
{
wd_start_abstime(&rtcb->waitdog, abstime,
nxsem_timeout, (uintptr_t)rtcb);
}
/* Now perform the blocking wait. If nxsem_wait() fails, the
* negated errno value will be returned below.
*/
ret = nxsem_wait(sem);
/* Stop the watchdog timer */
wd_cancel(&rtcb->waitdog);
/* We can now restore interrupts and delete the watchdog */
out:
leave_critical_section(flags);
return ret;
}