Skip to content

sched/wdog: Fix tickless watchdog handling issue #17308

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

Closed
wangchdo wants to merge 2 commits into from
Closed

sched/wdog: Fix tickless watchdog handling issue #17308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b1e832
nuttx/arch.h: remove un-needed macro wrapper on tickless functions
wangchdo Nov 12, 2025
728baf9
sched/wdog: Fix tickless watchdog handling issue
wangchdo Nov 12, 2025
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
12 changes: 0 additions & 12 deletions include/nuttx/arch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1967,11 +1967,8 @@ void up_timer_getmask(FAR clock_t *mask);
****************************************************************************/

#if defined(CONFIG_SCHED_TICKLESS) && defined(CONFIG_SCHED_TICKLESS_ALARM)
# ifndef CONFIG_SCHED_TICKLESS_TICK_ARGUMENT
int up_alarm_cancel(FAR struct timespec *ts);
# else
int up_alarm_tick_cancel(FAR clock_t *ticks);
# endif
#endif

/****************************************************************************
Expand Down Expand Up @@ -2000,11 +1997,8 @@ int up_alarm_tick_cancel(FAR clock_t *ticks);
****************************************************************************/

#if defined(CONFIG_SCHED_TICKLESS) && defined(CONFIG_SCHED_TICKLESS_ALARM)
# ifndef CONFIG_SCHED_TICKLESS_TICK_ARGUMENT
int up_alarm_start(FAR const struct timespec *ts);
# else
int up_alarm_tick_start(clock_t ticks);
# endif
#endif

/****************************************************************************
Expand Down Expand Up @@ -2044,11 +2038,8 @@ int up_alarm_tick_start(clock_t ticks);
****************************************************************************/

#if defined(CONFIG_SCHED_TICKLESS) && !defined(CONFIG_SCHED_TICKLESS_ALARM)
# ifndef CONFIG_SCHED_TICKLESS_TICK_ARGUMENT
int up_timer_cancel(FAR struct timespec *ts);
# else
int up_timer_tick_cancel(FAR clock_t *ticks);
# endif
#endif

/****************************************************************************
Expand Down Expand Up @@ -2077,11 +2068,8 @@ int up_timer_tick_cancel(FAR clock_t *ticks);
****************************************************************************/

#if defined(CONFIG_SCHED_TICKLESS) && !defined(CONFIG_SCHED_TICKLESS_ALARM)
# ifndef CONFIG_SCHED_TICKLESS_TICK_ARGUMENT
int up_timer_start(FAR const struct timespec *ts);
# else
int up_timer_tick_start(clock_t ticks);
# endif
#endif

/****************************************************************************
Expand Down
10 changes: 10 additions & 0 deletions sched/wdog/wd_start.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,16 @@ int wd_start_abstick(FAR struct wdog_s *wdog, clock_t ticks,

reassess |= wd_insert(wdog, ticks, wdentry, arg);

if (clock_compare(wdog->expired, clock_systime_ticks()))
{
# ifdef CONFIG_SCHED_TICKLESS_ALARM
up_alarm_tick_start(clock_systime_ticks() + 1);
# else
up_timer_tick_start(clock_systime_ticks() + 1);
# endif
reassess = false;
}

if (!g_wdtimernested && reassess)
{
/* Resume the interval timer that will generate the next
Expand Down
Loading