diff options
Diffstat (limited to 'sysdeps/generic/pt-cond-timedwait.c')
| -rw-r--r-- | sysdeps/generic/pt-cond-timedwait.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/sysdeps/generic/pt-cond-timedwait.c b/sysdeps/generic/pt-cond-timedwait.c index 99761f3..4abeb71 100644 --- a/sysdeps/generic/pt-cond-timedwait.c +++ b/sysdeps/generic/pt-cond-timedwait.c @@ -73,7 +73,28 @@ __pthread_cond_timedwait_internal (pthread_cond_t *cond, pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, &canceltype); if (abstime) - err = __pthread_timedblock (self, abstime); + { + error_t err; + + err = __pthread_timedblock (self, abstime); + if (err) + /* We timed out. We may need to disconnect ourself from the + waiter queue. + + FIXME: What do we do if we get a wakeup message before we + disconnect ourself? It may remain until the next time we + block. */ + { + assert (err == ETIMEDOUT); + + __pthread_spin_lock (&mutex->__lock); + if (self->prevp) + __pthread_dequeue (self); + __pthread_spin_unlock (&mutex->__lock); + + return err; + } + } else { err = 0; |