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: Simplify wd_timer to reduce WCET.

Browse source 
This commit simplified wd_timer() to reduce WCET when `noswitches` is false.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
This commit is contained in:
ouyangxiangzhen 2025-05-30 09:59:00 +08:00 • committed by Xiang Xiao
parent 43e0c50aa7
commit 6b63a81f54
1 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

46
sched/wdog/wd_start.c
View file

@ -104,12 +104,13 @@
*
****************************************************************************/
static inline_function void wd_expiration(clock_t ticks)
static inline_function clock_t wd_expiration(clock_t ticks)
{
FAR struct wdog_s *wdog;
irqstate_t flags;
wdentry_t func;
wdparm_t arg;
clock_t ret = CLOCK_MAX;
flags = enter_critical_section();
@ -127,6 +128,7 @@ static inline_function void wd_expiration(clock_t ticks)
if (!clock_compare(wdog->expired, ticks))
{
ret = wdog->expired - ticks;
break;
}
@ -147,6 +149,8 @@ static inline_function void wd_expiration(clock_t ticks)
}
leave_critical_section(flags);
return ret;
}
/****************************************************************************
@ -338,37 +342,35 @@ clock_t wd_timer(clock_t ticks, bool noswitches)
{
FAR struct wdog_s *wdog;
irqstate_t flags;
sclock_t ret;
clock_t ret = CLOCK_MAX;
/* Check if the watchdog at the head of the list is ready to run */
if (!noswitches)
{
wd_expiration(ticks);
ret = wd_expiration(ticks);
}
flags = enter_critical_section();
/* Return the delay for the next watchdog to expire */
if (list_is_empty(&g_wdactivelist))
else
{
flags = enter_critical_section();
/* Return the delay for the next watchdog to expire */
if (!list_is_empty(&g_wdactivelist))
{
/* Notice that if noswitches, expired - g_wdtickbase
* may get negative value.
*/
wdog = list_first_entry(&g_wdactivelist, struct wdog_s, node);
ret = !clock_compare(wdog->expired, ticks) ?
wdog->expired - ticks : 0u;
}
leave_critical_section(flags);
return CLOCK_MAX;
}
/* Notice that if noswitches, expired - g_wdtickbase
* may get negative value.
*/
wdog = list_first_entry(&g_wdactivelist, struct wdog_s, node);
ret = wdog->expired - ticks;
leave_critical_section(flags);
/* Return the delay for the next watchdog to expire */
return MAX(ret, 0);
return ret;
}
#else