diff options
| author | Meco Jianting Man <[email protected]> | 2021-06-05 13:03:45 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-05 13:03:45 +0800 |
| commit | bfd8d21e388befc5d971075db5af0ed561abb4f2 (patch) | |
| tree | d5caabadeb30fc67b3e0efa6dad251617639e096 /src/clock.c | |
| parent | 02331fd30d1f1ca8c886aac4db6c8c111987913c (diff) | |
| parent | 28847008171ab7423b6b05b7157d3467f1525fda (diff) | |
Merge branch 'master' into mutexrevert
Diffstat (limited to 'src/clock.c')
| -rw-r--r-- | src/clock.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/clock.c b/src/clock.c index 0880d8d241..7df13775b2 100644 --- a/src/clock.c +++ b/src/clock.c @@ -13,7 +13,8 @@ * 2010-07-13 Bernard fix rt_tick_from_millisecond issue found by kuronca * 2011-06-26 Bernard add rt_tick_set function. * 2018-11-22 Jesven add per cpu tick - * 2020-12-29 Meco Man add function rt_tick_get_millisecond() + * 2020-12-29 Meco Man implement rt_tick_get_millisecond() + * 2021-06-01 Meco Man add critical section projection for rt_tick_increase() */ #include <rthw.h> @@ -22,7 +23,7 @@ #ifdef RT_USING_SMP #define rt_tick rt_cpu_index(0)->tick #else -static rt_tick_t rt_tick = 0; +static volatile rt_tick_t rt_tick = 0; #endif /** @@ -62,6 +63,9 @@ void rt_tick_set(rt_tick_t tick) void rt_tick_increase(void) { struct rt_thread *thread; + rt_base_t level; + + level = rt_hw_interrupt_disable(); /* increase the global tick */ #ifdef RT_USING_SMP @@ -78,11 +82,15 @@ void rt_tick_increase(void) { /* change to initialized tick */ thread->remaining_tick = thread->init_tick; - thread->stat |= RT_THREAD_STAT_YIELD; + rt_hw_interrupt_enable(level); rt_schedule(); } + else + { + rt_hw_interrupt_enable(level); + } /* check timer */ rt_timer_check(); |