X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_cond_timedwait.c;h=1f25c8e7b52ff2d8658d5021f2491a4dffbce0c6;hp=60ebbb97454c5e94e51b0632ca76ead79ac752a5;hb=400c5e5c8307a2ebe44ef1f203f5a15669f20347;hpb=bc244533ccd72a0ad075571e338a6af35cc162f5

diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
index 60ebbb97..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,12 +36,12 @@ 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;
 
-	if (m->_m_type && (m->_m_lock&INT_MAX) != __pthread_self()->tid)
+	if (m->_m_type && (m->_m_lock&INT_MAX) != pthread_self()->tid)
 		return EPERM;
 
 	if (ts && ts->tv_nsec >= 1000000000UL)