You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/11/20 08:28:14 UTC
[incubator-nuttx] branch master updated: sched:watchdog: remove tick check in wd_timer
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 060b99d sched:watchdog: remove tick check in wd_timer
060b99d is described below
commit 060b99d67c7a94e94f325d03b10b99922052c212
Author: zhuyanlin <zh...@xiaomi.com>
AuthorDate: Thu Nov 18 17:57:05 2021 +0800
sched:watchdog: remove tick check in wd_timer
In scene with CONFIG_SCHED_TICKLESS but no CONFIG_SCHED_TICKLESS_ALARM
The system may crash by assert
`up_assert: Assertion failed at file:wdog/wd_start.c line: 379 task: rptun`
Signed-off-by: zhuyanlin <zh...@xiaomi.com>
---
sched/wdog/wd_start.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/sched/wdog/wd_start.c b/sched/wdog/wd_start.c
index a91cfbb..97654c1 100644
--- a/sched/wdog/wd_start.c
+++ b/sched/wdog/wd_start.c
@@ -370,14 +370,6 @@ unsigned int wd_timer(int ticks, bool noswitches)
wdog = (FAR struct wdog_s *)g_wdactivelist.head;
while (wdog != NULL && ticks > 0)
{
-#ifndef CONFIG_SCHED_TICKLESS_ALARM
- /* There is logic to handle the case where ticks is greater than
- * the watchdog lag, but if the scheduling is working properly
- * that should never happen.
- */
-
- DEBUGASSERT(ticks <= wdog->lag);
-#endif
/* Decrement the lag for this watchdog. */
decr = MIN(wdog->lag, ticks);