yystopf/openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!532 fix: 修改DoNanoSleep 以纳秒为单位

Browse Source 
Merge pull request !532 from zhushengle/sleep
This commit is contained in:
openharmony_ci
2021-08-10 11:37:44 +00:00
committed by Gitee
parent cdf96fef0c 6917e08431
commit 51da89a3fb
5 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compat/posix/src/time.c
+7 -7
View File
@@ -964,11 +964,11 @@ int timer_getoverrun(timer_t timerID)
return (overRun > DELAYTIMER_MAX) ? DELAYTIMER_MAX : overRun;
}
STATIC INT32 DoNanoSleep(UINT64 useconds)
STATIC INT32 DoNanoSleep(UINT64 nanoseconds)
{
UINT32 ret;
ret = LOS_TaskDelay(OsUS2Tick(useconds));
ret = LOS_TaskDelay(OsNS2Tick(nanoseconds));
if (ret == LOS_OK || ret == LOS_ERRNO_TSK_YIELD_NOT_ENOUGH_TASK) {
return 0;
}
@@ -977,12 +977,12 @@ STATIC INT32 DoNanoSleep(UINT64 useconds)
int usleep(unsigned useconds)
{
return DoNanoSleep((UINT64)useconds);
return DoNanoSleep((UINT64)useconds * OS_SYS_NS_PER_US);
}
int nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
{
UINT64 useconds;
UINT64 nanoseconds;
INT32 ret = -1;
(VOID)rmtp;
@@ -993,14 +993,14 @@ int nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
return ret;
}
useconds = (UINT64)rqtp->tv_sec * OS_SYS_US_PER_SECOND + rqtp->tv_nsec / OS_SYS_NS_PER_US;
nanoseconds = (UINT64)rqtp->tv_sec * OS_SYS_NS_PER_SECOND + rqtp->tv_nsec;
return DoNanoSleep(useconds);
return DoNanoSleep(nanoseconds);
}
unsigned int sleep(unsigned int seconds)
{
return DoNanoSleep((UINT64)seconds * OS_SYS_US_PER_SECOND);
return DoNanoSleep((UINT64)seconds * OS_SYS_NS_PER_SECOND);
}
double difftime(time_t time2, time_t time1)