From 348bd83b08857e7302e9e17fb77603372096c7d9 Mon Sep 17 00:00:00 2001 From: HubretXie Date: Wed, 20 Mar 2019 14:54:17 +0800 Subject: 【修复】修复计算中间值溢出问题 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rt_tick_from_millisecond 当入参较大时，计算中间值会出现溢出情况，导致转换结果出错 --- src/clock.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/clock.c b/src/clock.c index 4fa73da472..5fcd1d4ae4 100644 --- a/src/clock.c +++ b/src/clock.c @@ -107,15 +107,20 @@ void rt_tick_increase(void) * * @return the calculated tick */ -int rt_tick_from_millisecond(rt_int32_t ms) +rt_tick_t rt_tick_from_millisecond(rt_int32_t ms) { - int tick; + rt_tick_t tick; if (ms < 0) + { tick = RT_WAITING_FOREVER; + } else - tick = (RT_TICK_PER_SECOND * ms + 999) / 1000; - + { + tick = RT_TICK_PER_SECOND * (ms / 1000); + tick += (RT_TICK_PER_SECOND * (ms%1000) + 999) / 1000; + } + /* return the calculated tick */ return tick; } -- cgit v1.3.1 From 1e16a1ef23135d54b8e8972909b9c64fa815ed9d Mon Sep 17 00:00:00 2001 From: HubretXie Date: Wed, 20 Mar 2019 14:55:59 +0800 Subject: 修改函数返回类型 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rt_tick_from_millisecond返回类型修改为rt_tick_t --- include/rtthread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/rtthread.h b/include/rtthread.h index e66e30fddb..955ea51c50 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -75,7 +75,7 @@ void rt_system_tick_init(void); rt_tick_t rt_tick_get(void); void rt_tick_set(rt_tick_t tick); void rt_tick_increase(void); -int rt_tick_from_millisecond(rt_int32_t ms); +rt_tick_t rt_tick_from_millisecond(rt_int32_t ms); void rt_system_timer_init(void); void rt_system_timer_thread_init(void); -- cgit v1.3.1