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.
This commit is contained in:
Rich Felker
2011-08-02 21:11:36 -04:00
parent c68de0be2f
commit ec381af902
10 changed files with 56 additions and 53 deletions

View File

@ -10,15 +10,9 @@ int sem_timedwait(sem_t *sem, const struct timespec *at)
{
while (sem_trywait(sem)) {
int r;
if (at && at->tv_nsec >= 1000000000UL) {
errno = EINVAL;
return -1;
}
a_inc(sem->__val+1);
a_cas(sem->__val, 0, -1);
pthread_cleanup_push(cleanup, sem->__val+1);
r = __timedwait_cp(sem->__val, -1, CLOCK_REALTIME, at, 0);
pthread_cleanup_pop(1);
r = __timedwait(sem->__val, -1, CLOCK_REALTIME, at, cleanup, sem->__val+1, 0);
if (r) {
errno = r;
return -1;