sched/wdog: Simplify nxsched_timer_process.
This commit simplified `nxsched_timer_process` implementation and improve its readability. Signed-off-by: ouyangxiangzhen <ouyangxiangzhen@xiaomi.com>
This commit is contained in:
parent
5d9a1aaf75
commit
ba06ea6fd7
1 changed files with 14 additions and 13 deletions
|
|
@ -348,8 +348,9 @@ static clock_t nxsched_process_scheduler(clock_t ticks, clock_t elapsed,
|
||||||
static clock_t nxsched_timer_process(clock_t ticks, clock_t elapsed,
|
static clock_t nxsched_timer_process(clock_t ticks, clock_t elapsed,
|
||||||
bool noswitches)
|
bool noswitches)
|
||||||
{
|
{
|
||||||
clock_t rettime = 0;
|
clock_t sched_next_time;
|
||||||
clock_t tmp;
|
clock_t wdog_next_time;
|
||||||
|
clock_t next_time;
|
||||||
|
|
||||||
#ifdef CONFIG_CLOCK_TIMEKEEPING
|
#ifdef CONFIG_CLOCK_TIMEKEEPING
|
||||||
/* Process wall time */
|
/* Process wall time */
|
||||||
|
|
@ -361,21 +362,21 @@ static clock_t nxsched_timer_process(clock_t ticks, clock_t elapsed,
|
||||||
* active task.
|
* active task.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
tmp = nxsched_process_scheduler(ticks, elapsed, noswitches);
|
sched_next_time = nxsched_process_scheduler(ticks, elapsed, noswitches);
|
||||||
if (tmp > 0)
|
|
||||||
{
|
|
||||||
rettime = tmp;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Process watchdogs */
|
/* Process watchdogs */
|
||||||
|
|
||||||
tmp = wd_timer(ticks, noswitches);
|
wdog_next_time = wd_timer(ticks, noswitches);
|
||||||
if (tmp > 0 && (rettime == 0 || tmp < rettime))
|
|
||||||
{
|
|
||||||
rettime = tmp;
|
|
||||||
}
|
|
||||||
|
|
||||||
return rettime;
|
/* If sched_next_time or wdog_next_time is 0,
|
||||||
|
* then subtracting 1 overflows to the maximum value,
|
||||||
|
* which is never selected.
|
||||||
|
*/
|
||||||
|
|
||||||
|
next_time = MIN(sched_next_time - 1, wdog_next_time - 1);
|
||||||
|
next_time += 1;
|
||||||
|
|
||||||
|
return next_time;
|
||||||
}
|
}
|
||||||
|
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue