mirror of
https://github.com/apache/nuttx.git
synced 2026-06-04 23:03:27 +08:00
sched/clock/clock_timekeeping.c: fix cases in time conversion that must be >= NSEC_PER_SEC, not >NSEC_PER_SEC. Similar to fix of f9e80c4a1e.
This commit is contained in:
@@ -99,7 +99,7 @@ static int clock_get_current_time(FAR struct timespec *ts,
|
|||||||
nsec -= sec * NSEC_PER_SEC;
|
nsec -= sec * NSEC_PER_SEC;
|
||||||
|
|
||||||
nsec += base->tv_nsec;
|
nsec += base->tv_nsec;
|
||||||
if (nsec > NSEC_PER_SEC)
|
if (nsec >= NSEC_PER_SEC)
|
||||||
{
|
{
|
||||||
nsec -= NSEC_PER_SEC;
|
nsec -= NSEC_PER_SEC;
|
||||||
sec += 1;
|
sec += 1;
|
||||||
@@ -153,7 +153,7 @@ errout_in_critical_section:
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/********************************************************************************
|
/****************************************************************************
|
||||||
* Name: adjtime
|
* Name: adjtime
|
||||||
*
|
*
|
||||||
* Description:
|
* Description:
|
||||||
@@ -248,7 +248,7 @@ void clock_update_wall_time(void)
|
|||||||
nsec -= sec * NSEC_PER_SEC;
|
nsec -= sec * NSEC_PER_SEC;
|
||||||
|
|
||||||
nsec += g_clock_wall_time.tv_nsec;
|
nsec += g_clock_wall_time.tv_nsec;
|
||||||
if (nsec > NSEC_PER_SEC)
|
if (nsec >= NSEC_PER_SEC)
|
||||||
{
|
{
|
||||||
nsec -= NSEC_PER_SEC;
|
nsec -= NSEC_PER_SEC;
|
||||||
sec += 1;
|
sec += 1;
|
||||||
@@ -270,7 +270,7 @@ void clock_update_wall_time(void)
|
|||||||
sec -= 1;
|
sec -= 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (nsec > NSEC_PER_SEC)
|
while (nsec >= NSEC_PER_SEC)
|
||||||
{
|
{
|
||||||
nsec -= NSEC_PER_SEC;
|
nsec -= NSEC_PER_SEC;
|
||||||
sec += 1;
|
sec += 1;
|
||||||
|
|||||||
Reference in New Issue
Block a user