luchianmihai/walnux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sched/wdog: Add max delay tick limitation.

Browse source 
This commit changed the type of the delay ticks to the unsigned, which can reduce the useless branch conditions
Besides, this commit added max delay tick limitation to fix incorrect timing behavior if we delay SCLOCK_MAX in the SMP build.

Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
This commit is contained in:
ouyangxiangzhen 2025-05-16 16:07:05 +08:00 • committed by Alin Jerpelea
parent fce40edb6b
commit 947856efe0
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/reference/os/time_clock.rst
View file

@ -494,7 +494,7 @@ with NuttX tasks.
- :c:func:`wd_gettime`
- Watchdog Timer Callback
.. c:function:: int wd_start(FAR struct wdog_s *wdog, int delay, \
.. c:function:: int wd_start(FAR struct wdog_s *wdog, clock_t delay, \
wdentry_t wdentry, wdparm_t arg)
This function adds a watchdog to the timer queue.

19
include/nuttx/wdog.h
View file

@ -39,7 +39,20 @@
****************************************************************************/
#define WDOG_ISACTIVE(w) ((w)->func != NULL)
#define WDOG_MAX_DELAY ((CLOCK_MAX) / 2 - 1)
/* The maximum delay tick are supposed to be CLOCK_MAX >> 1.
* However, if there are expired wdog timers in the wdog queue,
* clock_compare might be incorrect when the delay is CLOCK_MAX >> 1.
* e.g. Current tick is 123, and there is an expired wdog timer with the
* expired ticks 100. If we insert a wdog timer with delay CLOCK_MAX >> 1,
* Then clock_compare(100, 123 + CLOCK_MAX >> 1) will return false, leading
* to the new wdog timer queued before the expired wdog timer.
* So we limited the delay to CLOCK_MAX >> 2, which is 2^30 - 1 or 2^62 - 1.
* Assuming all expired wdog timer can be processed within WDOG_MAX_DELAY
* ticks, this ensure the correct enqueue of the wdog timer.
*/
#define WDOG_MAX_DELAY (CLOCK_MAX >> 2)
/****************************************************************************
* Public Type Declarations
@ -141,7 +154,7 @@ extern "C"
*
****************************************************************************/
int wd_start(FAR struct wdog_s *wdog, sclock_t delay,
int wd_start(FAR struct wdog_s *wdog, clock_t delay,
wdentry_t wdentry, wdparm_t arg);
/****************************************************************************
@ -307,7 +320,7 @@ static inline int wd_start_realtime(FAR struct wdog_s *wdog,
*
****************************************************************************/
int wd_start_period(FAR struct wdog_period_s *wdog, sclock_t delay,
int wd_start_period(FAR struct wdog_period_s *wdog, clock_t delay,
clock_t period, wdentry_t wdentry, wdparm_t arg);
/****************************************************************************

8
sched/wdog/wd_start.c
View file

@ -406,12 +406,12 @@ int wd_start_abstick(FAR struct wdog_s *wdog, clock_t ticks,
*
****************************************************************************/
int wd_start(FAR struct wdog_s *wdog, sclock_t delay,
int wd_start(FAR struct wdog_s *wdog, clock_t delay,
wdentry_t wdentry, wdparm_t arg)
{
/* Verify the wdog and setup parameters */
/* Ensure delay is within the range the wdog can handle. */
if (delay < 0)
if (delay > WDOG_MAX_DELAY)
{
return -EINVAL;
}
@ -444,7 +444,7 @@ int wd_start(FAR struct wdog_s *wdog, sclock_t delay,
*
****************************************************************************/
int wd_start_period(FAR struct wdog_period_s *wdog, sclock_t delay,
int wd_start_period(FAR struct wdog_period_s *wdog, clock_t delay,
clock_t period, wdentry_t wdentry, wdparm_t arg)
{
if (!wdog || !period || !wdentry)