jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

unify and overhaul timed futex waits

Browse source 
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
commit ec381af902
10 changed files with 56 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/thread/pthread_cond_timedwait.c
View file

@ -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();