libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3335 from geniusgogo/fixed_timerlist_search 

[src/timer.c]fixed rt_timer_list_next_timeout multi-task safe
This commit is contained in:
Bernard Xiong 2020-01-15 16:35:27 +08:00 committed by GitHub
parent cad32a326c 3b87cb8ded
commit f390d79f1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/timer.c
View File

@ -108,14 +108,23 @@ static void _rt_timer_init(rt_timer_t timer,
static rt_tick_t rt_timer_list_next_timeout(rt_list_t timer_list[]) static rt_tick_t rt_timer_list_next_timeout(rt_list_t timer_list[])
{ {
struct rt_timer *timer; struct rt_timer *timer;
register rt_base_t level;
rt_tick_t timeout_tick = RT_TICK_MAX;
if (rt_list_isempty(&timer_list[RT_TIMER_SKIP_LIST_LEVEL - 1])) /* disable interrupt */
return RT_TICK_MAX; level = rt_hw_interrupt_disable();
timer = rt_list_entry(timer_list[RT_TIMER_SKIP_LIST_LEVEL - 1].next, if (!rt_list_isempty(&timer_list[RT_TIMER_SKIP_LIST_LEVEL - 1]))
struct rt_timer, row[RT_TIMER_SKIP_LIST_LEVEL - 1]); {
timer = rt_list_entry(timer_list[RT_TIMER_SKIP_LIST_LEVEL - 1].next,
struct rt_timer, row[RT_TIMER_SKIP_LIST_LEVEL - 1]);
timeout_tick = timer->timeout_tick;
}
return timer->timeout_tick; /* enable interrupt */
rt_hw_interrupt_enable(level);
return timeout_tick;
} }
rt_inline void _rt_timer_remove(rt_timer_t timer) rt_inline void _rt_timer_remove(rt_timer_t timer)