diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2005-12-14 07:02:48 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2005-12-14 07:02:48 +0000 |
| commit | 0be99845d8d373eb8a1e3054db45fece9e6521b7 (patch) | |
| tree | 3018104262dfbc436a01607443ba6a3d24c407ac | |
| parent | af7a959013caf2c5c267715ae41cd8d7cc91c721 (diff) | |
all is made clear: pthread_cond_timedwait takes absolute timeouts
| -rw-r--r-- | lib/librthread/rthread_sync.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/lib/librthread/rthread_sync.c b/lib/librthread/rthread_sync.c index c93ebd82187..616be71ad55 100644 --- a/lib/librthread/rthread_sync.c +++ b/lib/librthread/rthread_sync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rthread_sync.c,v 1.8 2005/12/14 04:14:19 tedu Exp $ */ +/* $OpenBSD: rthread_sync.c,v 1.9 2005/12/14 07:02:47 tedu Exp $ */ /* * Copyright (c) 2004 Ted Unangst <tedu@openbsd.org> * All Rights Reserved. @@ -375,15 +375,29 @@ pthread_cond_timedwait(pthread_cond_t *condp, pthread_mutex_t *mutexp, { int error; int rv; + int timo = 0; + struct timeval timenow; + struct timespec tmspec; if (!*condp) if ((error = pthread_cond_init(condp, NULL))) return (error); + if (abstime && gettimeofday(&timenow, NULL) == 0) { + TIMEVAL_TO_TIMESPEC(&timenow, &tmspec); + if (timespeccmp(abstime, &tmspec, <)) { + pthread_mutex_unlock(mutexp); + error = pthread_mutex_lock(mutexp); + return (error ? error : ETIMEDOUT); + } + timespecsub(abstime, &tmspec, &tmspec); + timo = tmspec.tv_sec * 1000 + tmspec.tv_nsec / 1000000; + } + + _spinlock(&(*condp)->sem.lock); pthread_mutex_unlock(mutexp); - rv = _sem_waitl(&(*condp)->sem, 0, (abstime ? - abstime->tv_sec * 1000 + abstime->tv_nsec / 1000000 : 0)); + rv = _sem_waitl(&(*condp)->sem, 0, timo); error = pthread_mutex_lock(mutexp); return (error ? error : rv ? 0 : ETIMEDOUT); |