xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #18613 from taosdata/FIX/xsren/TD-20738-timewait 

fix:window time wait
This commit is contained in:
Shengliang Guan 2022-12-02 08:01:52 +08:00 committed by GitHub
parent a366696478 c0c1e0dadd
commit 8efb45ffbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/os/src/osSemaphore.c
View File

@ -75,20 +75,16 @@ int32_t tsem_wait(tsem_t* sem) {
return ret; return ret;
} }
int32_t tsem_timewait(tsem_t* sem, int64_t milis) { int32_t tsem_timewait(tsem_t* sem, int64_t ms) {
return 0;
/*return tsem_wait(sem);*/
#if 0
struct timespec ts; struct timespec ts;
timespec_get(&ts); taosClockGetTime(0, &ts);
ts.tv_nsec += ms * 1000000; ts.tv_nsec += ms * 1000000;
ts.tv_sec += ts.tv_nsec / 1000000000; ts.tv_sec += ts.tv_nsec / 1000000000;
ts.tv_nsec %= 1000000000; ts.tv_nsec %= 1000000000;
int rc;
/*GetSystemTimeAsFileTime(&ft_before);*/ while ((rc = sem_timedwait(sem, &ts)) == -1 && errno == EINTR) continue;
// errno = 0; return rc;
rc = sem_timedwait(sem, ts);
/* This should have timed out */ /* This should have timed out */
// assert(errno == ETIMEDOUT); // assert(errno == ETIMEDOUT);
// assert(rc != 0); // assert(rc != 0);
@ -103,8 +99,6 @@ int32_t tsem_timewait(tsem_t* sem, int64_t milis) {
// printf("time must advance during sem_timedwait."); // printf("time must advance during sem_timedwait.");
// return 1; // return 1;
// } // }
return rc;
#endif
} }
#elif defined(_TD_DARWIN_64) #elif defined(_TD_DARWIN_64)