From 302f179c851d3a8c953400ca0d2789546c50491c Mon Sep 17 00:00:00 2001 From: liruncong Date: Tue, 9 Feb 2021 23:18:45 +0800 Subject: 修正rt_thread_delay_until时间不准问题，及错误使用无符号比较问题 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/thread.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/thread.c') diff --git a/src/thread.c b/src/thread.c index 0db9dd8e4d..627b7e898e 100644 --- a/src/thread.c +++ b/src/thread.c @@ -585,6 +585,7 @@ rt_err_t rt_thread_delay_until(rt_tick_t *tick, rt_tick_t inc_tick) { register rt_base_t level; struct rt_thread *thread; + rt_tick_t cur_tick; RT_ASSERT(tick != RT_NULL); @@ -596,15 +597,19 @@ rt_err_t rt_thread_delay_until(rt_tick_t *tick, rt_tick_t inc_tick) /* disable interrupt */ level = rt_hw_interrupt_disable(); - if (rt_tick_get() - *tick < inc_tick) + cur_tick = rt_tick_get(); + if ((rt_int32_t)(cur_tick - *tick) < (rt_int32_t)inc_tick) { - *tick = *tick + inc_tick - rt_tick_get(); + rt_tick_t left_tick; + + *tick += inc_tick; + left_tick = *tick - cur_tick; /* suspend thread */ rt_thread_suspend(thread); /* reset the timeout of thread timer and start it */ - rt_timer_control(&(thread->thread_timer), RT_TIMER_CTRL_SET_TIME, tick); + rt_timer_control(&(thread->thread_timer), RT_TIMER_CTRL_SET_TIME, &left_tick); rt_timer_start(&(thread->thread_timer)); /* enable interrupt */ @@ -620,12 +625,10 @@ rt_err_t rt_thread_delay_until(rt_tick_t *tick, rt_tick_t inc_tick) } else { + *tick = cur_tick; rt_hw_interrupt_enable(level); } - /* get the wakeup tick */ - *tick = rt_tick_get(); - return RT_EOK; } RTM_EXPORT(rt_thread_delay_until); -- cgit v1.3.1 From 5ce889ea820e1c5bbadc41a0464b2dcdf3e607fc Mon Sep 17 00:00:00 2001 From: liruncong Date: Thu, 4 Mar 2021 19:33:28 +0800 Subject: 撤销有符号比较，仍应使用无符号比较 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/thread.c') diff --git a/src/thread.c b/src/thread.c index 627b7e898e..c2a3e2e797 100644 --- a/src/thread.c +++ b/src/thread.c @@ -598,7 +598,7 @@ rt_err_t rt_thread_delay_until(rt_tick_t *tick, rt_tick_t inc_tick) level = rt_hw_interrupt_disable(); cur_tick = rt_tick_get(); - if ((rt_int32_t)(cur_tick - *tick) < (rt_int32_t)inc_tick) + if (cur_tick - *tick < inc_tick) { rt_tick_t left_tick; -- cgit v1.3.1