X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_cond_timedwait.c;h=1f25c8e7b52ff2d8658d5021f2491a4dffbce0c6;hp=c71edc95bc8274473de5056447d384eea9af4c62;hb=8c0a3d9e5c169fc9d0f246ab59362b658b029ad7;hpb=97c5b5a87c3d9df54278e1073d6177f77536bd32

diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
index c71edc95..1f25c8e7 100644
--- a/src/thread/pthread_cond_timedwait.c
+++ b/src/thread/pthread_cond_timedwait.c
@@ -5,17 +5,44 @@ struct cm {
 	pthread_mutex_t *m;
 };
 
+static void unwait(pthread_cond_t *c, pthread_mutex_t *m)
+{
+	/* Removing a waiter is non-trivial if we could be using requeue
+	 * based broadcast signals, due to mutex access issues, etc. */
+
+	if (c->_c_mutex == (void *)-1) {
+		a_dec(&c->_c_waiters);
+		if (c->_c_destroy) __wake(&c->_c_waiters, 1, 0);
+		return;
+	}
+
+	while (a_swap(&c->_c_lock, 1))
+		__wait(&c->_c_lock, &c->_c_lockwait, 1, 1);
+
+	if (c->_c_waiters2) c->_c_waiters2--;
+	else a_dec(&m->_m_waiters);
+
+	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)
 {
 	struct cm *cm = p;
-	a_dec(&cm->c->_c_waiters);
+	unwait(cm->c, cm->m);
 	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, tid;
+	int r, e=0, seq;
+
+	if (m->_m_type && (m->_m_lock&INT_MAX) != pthread_self()->tid)
+		return EPERM;
 
 	if (ts && ts->tv_nsec >= 1000000000UL)
 		return EINVAL;
@@ -23,18 +50,27 @@ int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct t
 	pthread_testcancel();
 
 	a_inc(&c->_c_waiters);
-	c->_c_block = tid = pthread_self()->tid;
 
-	if ((r=pthread_mutex_unlock(m))) return r;
+	if (c->_c_mutex != (void *)-1) {
+		c->_c_mutex = m;
+		while (a_swap(&c->_c_lock, 1))
+			__wait(&c->_c_lock, &c->_c_lockwait, 1, 1);
+		c->_c_waiters2++;
+		a_store(&c->_c_lock, 0);
+		if (c->_c_lockwait) __wake(&c->_c_lock, 1, 1);
+	}
+
+	seq = c->_c_seq;
 
-	do e = __timedwait(&c->_c_block, tid, c->_c_clock, ts, cleanup, &cm, 0);
-	while (c->_c_block == tid && (!e || e==EINTR));
+	pthread_mutex_unlock(m);
+
+	do e = __timedwait(&c->_c_seq, seq, c->_c_clock, ts, cleanup, &cm, 0);
+	while (c->_c_seq == seq && (!e || e==EINTR));
 	if (e == EINTR) e = 0;
 
-	a_dec(&c->_c_waiters);
+	unwait(c, m);
 
 	if ((r=pthread_mutex_lock(m))) return r;
 
-	pthread_testcancel();
 	return e;
 }