OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

sched/sched/sched_timerexpiration.c: Fix macro SEC2TICK() 32-bits overflow by using uint64_t in calculation.

This commit is contained in:
ligd 2019-01-27 11:07:09 -06:00 committed by Gregory Nutt
parent cc8878f08a
commit 14573202bc
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sched/sched/sched_timerexpiration.c
View File

@ -492,7 +492,11 @@ void sched_alarm_expiration(FAR const struct timespec *ts)
clock_timespec_subtract(ts, &g_stop_time, &delta); clock_timespec_subtract(ts, &g_stop_time, &delta);
#ifdef CONFIG_HAVE_LONG_LONG
elapsed = SEC2TICK((uint64_t)delta.tv_sec);
#else
elapsed = SEC2TICK(delta.tv_sec); elapsed = SEC2TICK(delta.tv_sec);
#endif
elapsed += delta.tv_nsec / NSEC_PER_TICK; elapsed += delta.tv_nsec / NSEC_PER_TICK;
/* Save the time that the alarm occurred */ /* Save the time that the alarm occurred */
@ -616,7 +620,11 @@ unsigned int sched_timer_cancel(void)
/* Convert to ticks */ /* Convert to ticks */
#ifdef CONFIG_HAVE_LONG_LONG
elapsed = SEC2TICK((uint64_t)ts.tv_sec);
#else
elapsed = SEC2TICK(ts.tv_sec); elapsed = SEC2TICK(ts.tv_sec);
#endif
elapsed += ts.tv_nsec / NSEC_PER_TICK; elapsed += ts.tv_nsec / NSEC_PER_TICK;
/* Correct g_stop_time cause of the elapsed have remainder */ /* Correct g_stop_time cause of the elapsed have remainder */
@ -652,7 +660,11 @@ unsigned int sched_timer_cancel(void)
/* Convert to ticks */ /* Convert to ticks */
#ifdef CONFIG_HAVE_LONG_LONG
ticks = SEC2TICK((uint64_t)ts.tv_sec);
#else
ticks = SEC2TICK(ts.tv_sec); ticks = SEC2TICK(ts.tv_sec);
#endif
ticks += NSEC2TICK(ts.tv_nsec); ticks += NSEC2TICK(ts.tv_nsec);
DEBUGASSERT(ticks <= g_timer_interval); DEBUGASSERT(ticks <= g_timer_interval);