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_cond_timedwait.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/thread/pthread_cond_timedwait.c') diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c index 13728282..ee874a36 100644 --- a/src/thread/pthread_cond_timedwait.c +++ b/src/thread/pthread_cond_timedwait.c @@ -9,16 +9,17 @@ int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct t { int r, e=0; + if (ts && ts->tv_nsec >= 1000000000UL) + return EINVAL; + pthread_testcancel(); - pthread_cleanup_push(relock, m); c->_c_block = 1; if ((r=pthread_mutex_unlock(m))) return r; - do e = __timedwait_cp(&c->_c_block, 1, c->_c_clock, ts, 0); + do e = __timedwait(&c->_c_block, 1, c->_c_clock, ts, relock, m, 0); while (e == EINTR); - pthread_cleanup_pop(0); if ((r=pthread_mutex_lock(m))) return r; pthread_testcancel(); -- cgit v1.2.1