Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-01 07:45:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sched: Remove checking of WDOG_ISACTIVE when cancelling wdog

Browse Source 
Checking only adds a race condition. The checking if the wdog is active
or not must be done inside wd_cancel, where the proper spinlock is held

Signed-off-by: Jukka Laitinen <jukka.laitinen@tii.ae>
This commit is contained in:
Jukka Laitinen
2025-05-15 10:36:20 +03:00
committed by Xiang Xiao
parent ccc974b224
commit 6ed21ec1af
6 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sched/mqueue/mq_rcvinternal.c
+1 -4
View File
@@ -253,10 +253,7 @@ void nxmq_notify_receive(FAR struct mqueue_inode_s *msgq)
DEBUGASSERT(btcb != NULL); DEBUGASSERT(btcb != NULL);
if (WDOG_ISACTIVE(&btcb->waitdog)) wd_cancel(&btcb->waitdog);
{
wd_cancel(&btcb->waitdog);
}
msgq->cmn.nwaitnotfull--; msgq->cmn.nwaitnotfull--;
sched/mqueue/mq_sndinternal.c
+1 -4
View File
@@ -286,10 +286,7 @@ void nxmq_notify_send(FAR struct mqueue_inode_s *msgq)
DEBUGASSERT(btcb); DEBUGASSERT(btcb);
if (WDOG_ISACTIVE(&btcb->waitdog)) wd_cancel(&btcb->waitdog);
{
wd_cancel(&btcb->waitdog);
}
msgq->cmn.nwaitnotempty--; msgq->cmn.nwaitnotempty--;
sched/mqueue/msgrcv.c
+1 -4
View File
@@ -252,10 +252,7 @@ ssize_t msgrcv(int msqid, FAR void *msgp, size_t msgsz, long msgtyp,
DEBUGASSERT(btcb != NULL); DEBUGASSERT(btcb != NULL);
if (WDOG_ISACTIVE(&btcb->waitdog)) wd_cancel(&btcb->waitdog);
{
wd_cancel(&btcb->waitdog);
}
msgq->cmn.nwaitnotfull--; msgq->cmn.nwaitnotfull--;
sched/mqueue/msgsnd.c
+1 -4
View File
@@ -245,10 +245,7 @@ int msgsnd(int msqid, FAR const void *msgp, size_t msgsz, int msgflg)
DEBUGASSERT(btcb); DEBUGASSERT(btcb);
if (WDOG_ISACTIVE(&btcb->waitdog)) wd_cancel(&btcb->waitdog);
{
wd_cancel(&btcb->waitdog);
}
msgq->cmn.nwaitnotempty--; msgq->cmn.nwaitnotempty--;
sched/semaphore/sem_post.c
+1 -4
View File
@@ -209,10 +209,7 @@ int nxsem_post_slow(FAR sem_t *sem)
/* Stop the watchdog timer */ /* Stop the watchdog timer */
if (WDOG_ISACTIVE(&stcb->waitdog)) wd_cancel(&stcb->waitdog);
{
wd_cancel(&stcb->waitdog);
}
/* Indicate that the wait is over. */ /* Indicate that the wait is over. */
sched/signal/sig_dispatch.c
+2 -10
View File
@@ -544,11 +544,7 @@ int nxsig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info,
} }
sigemptyset(&stcb->sigwaitmask); sigemptyset(&stcb->sigwaitmask);
wd_cancel(&stcb->waitdog);
if (WDOG_ISACTIVE(&stcb->waitdog))
{
wd_cancel(&stcb->waitdog);
}
/* Remove the task from waiting list */ /* Remove the task from waiting list */
@@ -606,11 +602,7 @@ int nxsig_tcbdispatch(FAR struct tcb_s *stcb, siginfo_t *info,
} }
sigemptyset(&stcb->sigwaitmask); sigemptyset(&stcb->sigwaitmask);
wd_cancel(&stcb->waitdog);
if (WDOG_ISACTIVE(&stcb->waitdog))
{
wd_cancel(&stcb->waitdog);
}
/* Remove the task from waiting list */ /* Remove the task from waiting list */