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_mutex_timedlock.c | |
| parent | c68de0be2fb649f91b31080224fb6e48084eaaee (diff) | |
| download | musl-ec381af90208a5675183202cf05078eac208edfb.tar.gz | |
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_mutex_timedlock.c')
| -rw-r--r-- | src/thread/pthread_mutex_timedlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c index ae1e2c31..44bd4bbe 100644 --- a/src/thread/pthread_mutex_timedlock.c +++ b/src/thread/pthread_mutex_timedlock.c @@ -16,7 +16,7 @@ int pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *at) a_inc(&m->_m_waiters); t = r | 0x80000000; a_cas(&m->_m_lock, r, t); - r = __timedwait(&m->_m_lock, t, CLOCK_REALTIME, at, 0); + r = __timedwait(&m->_m_lock, t, CLOCK_REALTIME, at, 0, 0, 0); a_dec(&m->_m_waiters); if (r && r != EINTR) break; } |