nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 13:18:50 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

sched/clock/: Don't call up_timer_gettime in clock_gettime and clock_systimer to ensure the return value from them consistent with clock_systimespec

Browse source
This commit is contained in:
Xiang Xiao 2018-11-12 06:52:56 -06:00 committed by Gregory Nutt
parent 46bd8798c5
commit f0c5c75042
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sched/clock/clock_gettime.c
View file

@ -93,11 +93,7 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
* reset.
*/
#if defined(CONFIG_SCHED_TICKLESS)
ret = up_timer_gettime(tp);
#else
ret = clock_systimespec(tp);
#endif
}
else
#endif
@ -118,13 +114,8 @@ int clock_gettime(clockid_t clock_id, struct timespec *tp)
#if defined(CONFIG_CLOCK_TIMEKEEPING)
ret = clock_timekeeping_get_wall_time(tp);
#elif defined(CONFIG_SCHED_TICKLESS)
ret = up_timer_gettime(&ts);
#else
ret = clock_systimespec(&ts);
#endif
#ifndef CONFIG_CLOCK_TIMEKEEPING
if (ret == OK)
{
irqstate_t flags;

4
sched/clock/clock_systimer.c
View file

@ -97,7 +97,7 @@ clock_t clock_systimer(void)
/* Get the time from the platform specific hardware */
(void)up_timer_gettime(&ts);
(void)clock_systimespec(&ts);
/* Convert to a 64-bit value in microseconds, then in clock tick units */
@ -110,7 +110,7 @@ clock_t clock_systimer(void)
/* Get the time from the platform specific hardware */
(void)up_timer_gettime(&ts);
(void)clock_systimespec(&ts);
/* Convert to a 64- then a 32-bit value */