torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use correct (absolute) time for pthread_cond_timedwait

Browse Source
This commit is contained in:
Nick Mathewson
2013-09-27 12:09:57 -04:00
parent 9fdc0d0594
commit d69717f61b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/compat_pthreads.c
+5 -2
View File
@@ -199,9 +199,12 @@ tor_cond_wait(tor_cond_t *cond, tor_mutex_t *mutex, const struct timeval *tv)
return pthread_cond_wait(&cond->cond, &mutex->mutex) ? -1 : 0;
} else {
struct timespec ts;
struct timeval tvnow, tvsum;
int r;
ts.tv_sec = tv->tv_sec;
ts.tv_nsec = tv->tv_usec * 1000;
gettimeofday(&tvnow, NULL);
timeradd(tv, &tvnow, &tvsum);
ts.tv_sec = tvsum.tv_sec;
ts.tv_nsec = tvsum.tv_usec * 1000;
r = pthread_cond_timedwait(&cond->cond, &mutex->mutex, &ts);
if (r == 0)
return 0;