Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-01 20:28:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

sched/wdog: Add wd_adjust_next_tick.

Browse source 
This commit added wd_adjust_next_tick to simplify the scheduler.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
This commit is contained in:
ouyangxiangzhen 2026-01-12 15:54:08 +08:00 • committed by Donny(董九柱)
parent f36a090aa9
commit 4cbc56eec5
3 changed files with 55 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sched/wdog/wd_initialize.c
View file

@ -43,6 +43,7 @@ struct list_node g_wdactivelist = LIST_INITIAL_VALUE(g_wdactivelist);
#ifdef CONFIG_SCHED_TICKLESS
bool g_wdtimernested;
clock_t g_wdexpired;
#endif
/****************************************************************************

4
sched/wdog/wd_start.c
View file

@ -114,6 +114,8 @@ static inline_function void wd_expiration(clock_t ticks)
flags = enter_critical_section();
wd_update_expire(ticks);
wd_set_nested(true);
/* Process the watchdog at the head of the list as well as any
@ -154,7 +156,7 @@ static inline_function void wd_expiration(clock_t ticks)
if (next_ticks != ticks)
{
wd_timer_start(wd_next_expire());
wd_timer_start(next_ticks);
}
leave_critical_section(flags);

54
sched/wdog/wdog.h
View file

@ -63,6 +63,7 @@ extern struct list_node g_wdactivelist;
#ifdef CONFIG_SCHED_TICKLESS
extern bool g_wdtimernested;
extern clock_t g_wdexpired;
#endif
/****************************************************************************
@ -70,16 +71,49 @@ extern bool g_wdtimernested;
****************************************************************************/
#ifdef CONFIG_SCHED_TICKLESS
# define wd_in_callback() (g_wdtimernested)
# define wd_set_nested(f) (g_wdtimernested = (f))
# define wd_in_callback() (g_wdtimernested)
# define wd_set_nested(f) (g_wdtimernested = (f))
# define wd_update_expire(expired) (g_wdexpired = (expired))
#else
# define wd_in_callback() (false)
# define wd_set_nested(f)
# define wd_update_expire(expired)
#endif
#ifdef CONFIG_SCHED_TICKLESS
static inline_function void wd_timer_start(clock_t next_tick)
static inline_function clock_t wd_adjust_next_tick(clock_t tick)
{
clock_t next_tick = tick;
#ifdef CONFIG_SCHED_TICKLESS_LIMIT_MAX_SLEEP
clock_t interval = clock_compare(g_wdexpired, tick) ?
tick - g_wdexpired : 0u;
interval = interval <= g_oneshot_maxticks ?
interval : g_oneshot_maxticks;
next_tick = g_wdexpired + interval;
#endif
#if CONFIG_TIMER_ADJUST_USEC > 0
/* Normally, timer event cannot triggered on exact time due to the
* existence of interrupt latency.
* Assuming that the interrupt latency is distributed within
* [Best-Case Execution Time, Worst-Case Execution Time],
* we can set the timer adjustment value to the BCET to reduce the latency.
* After the adjustment, the timer interrupt latency will be
* [0, WCET - BCET].
* Please use this carefully, if the timer adjustment value is not the
* best-case interrupt latency, it will immediately fired another timer
* interrupt, which may result in a much larger timer interrupt latency.
*/
next_tick -= CONFIG_TIMER_ADJUST_USEC / USEC_PER_TICK;
#endif
return next_tick;
}
static inline_function void wd_timer_start(clock_t tick)
{
clock_t next_tick = wd_adjust_next_tick(tick);
#ifdef CONFIG_SCHED_TICKLESS_ALARM
# ifndef CONFIG_ALARM_ARCH
struct timespec ts;
@ -124,6 +158,20 @@ static inline_function clock_t wd_next_expire(void)
* Public Function Prototypes
****************************************************************************/
static inline_function clock_t wd_get_next_expire(clock_t curr)
{
clock_t next = curr;
irqstate_t flags = enter_critical_section();
if (!list_is_empty(&g_wdactivelist))
{
next = wd_next_expire();
}
leave_critical_section(flags);
return (sclock_t)(next - curr) <= 0 ? 0u : next;
}
/****************************************************************************
* Name: wd_timer
*