diff options
author | Rich Felker <dalias@aerifal.cx> | 2011-08-02 21:11:36 -0400 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2011-08-02 21:11:36 -0400 |
commit | ec381af90208a5675183202cf05078eac208edfb (patch) | |
tree | 26005bfd6a3b4f7b4788183d89ec1c2769bd2022 /src/thread/pthread_rwlock_timedrdlock.c | |
parent | c68de0be2fb649f91b31080224fb6e48084eaaee (diff) | |
download | musl-ec381af90208a5675183202cf05078eac208edfb.tar.gz musl-ec381af90208a5675183202cf05078eac208edfb.tar.bz2 musl-ec381af90208a5675183202cf05078eac208edfb.tar.xz musl-ec381af90208a5675183202cf05078eac208edfb.zip |
unify and overhaul timed futex waits
new features:
- FUTEX_WAIT_BITSET op will be used for timed waits if available. this
saves a call to clock_gettime.
- error checking for the timespec struct is now inside __timedwait so
it doesn't need to be duplicated everywhere. cond_timedwait still
needs to duplicate it to avoid unlocking the mutex, though.
- pushing and popping the cancellation handler is delegated to
__timedwait, and cancellable/non-cancellable waits are unified.
Diffstat (limited to 'src/thread/pthread_rwlock_timedrdlock.c')
-rw-r--r-- | src/thread/pthread_rwlock_timedrdlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/thread/pthread_rwlock_timedrdlock.c b/src/thread/pthread_rwlock_timedrdlock.c index 1e76a8e1..a6f61b05 100644 --- a/src/thread/pthread_rwlock_timedrdlock.c +++ b/src/thread/pthread_rwlock_timedrdlock.c @@ -5,7 +5,7 @@ int pthread_rwlock_timedrdlock(pthread_rwlock_t *rw, const struct timespec *at) int w=0; while (pthread_rwlock_tryrdlock(rw)) { if (!w) a_inc(&rw->_rw_waiters), w++; - if (__timedwait(&rw->_rw_wrlock, 1, CLOCK_REALTIME, at, 0)==ETIMEDOUT) { + if (__timedwait(&rw->_rw_wrlock, 1, CLOCK_REALTIME, at, 0, 0, 0)==ETIMEDOUT) { if (w) a_dec(&rw->_rw_waiters); return ETIMEDOUT; } |