From ec381af90208a5675183202cf05078eac208edfb Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 2 Aug 2011 21:11:36 -0400 Subject: 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. --- src/thread/pthread_mutex_timedlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/thread/pthread_mutex_timedlock.c') 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; } -- cgit v1.2.1