summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHubretXie <[email protected]>2019-03-20 14:54:17 +0800
committerGitHub <[email protected]>2019-03-20 14:54:17 +0800
commit348bd83b08857e7302e9e17fb77603372096c7d9 (patch)
treeda8596e379c470a3b23022f1953dd131152d6c36 /src
parentc9d88a8e51f4e0bfc367579cdccb82426e7839bf (diff)
【修复】修复计算中间值溢出问题
rt_tick_from_millisecond 当入参较大时,计算中间值会出现溢出情况,导致转换结果出错
Diffstat (limited to 'src')
-rw-r--r--src/clock.c13
1 files 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;
}