X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_cond_timedwait.c;h=1f25c8e7b52ff2d8658d5021f2491a4dffbce0c6;hb=ac562aa1ef4012f617583f474a8d8e5c972ed6ee;hp=56e71c2d991ec5f45bd24f110284f9a146483b50;hpb=3ac092bd7d700c6316c64660e2a722a2f85652a5;p=musl diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c index 56e71c2d..1f25c8e7 100644 --- a/src/thread/pthread_cond_timedwait.c +++ b/src/thread/pthread_cond_timedwait.c @@ -12,6 +12,7 @@ static void unwait(pthread_cond_t *c, pthread_mutex_t *m) if (c->_c_mutex == (void *)-1) { a_dec(&c->_c_waiters); + if (c->_c_destroy) __wake(&c->_c_waiters, 1, 0); return; } @@ -23,6 +24,9 @@ static void unwait(pthread_cond_t *c, pthread_mutex_t *m) a_store(&c->_c_lock, 0); if (c->_c_lockwait) __wake(&c->_c_lock, 1, 1); + + a_dec(&c->_c_waiters); + if (c->_c_destroy) __wake(&c->_c_waiters, 1, 1); } static void cleanup(void *p) @@ -32,7 +36,7 @@ static void cleanup(void *p) pthread_mutex_lock(cm->m); } -int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct timespec *ts) +int pthread_cond_timedwait(pthread_cond_t *restrict c, pthread_mutex_t *restrict m, const struct timespec *restrict ts) { struct cm cm = { .c=c, .m=m }; int r, e=0, seq;