X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_cond_broadcast.c;h=848e288f5ea6dc25de38b901210bbace6f2bc2de;hp=3daa78174b99b77473542cf42735c905c4072d97;hb=8c0a3d9e5c169fc9d0f246ab59362b658b029ad7;hpb=cba4e1c0a3423ed07ef5c79f6e29360996f32fd7

diff --git a/src/thread/pthread_cond_broadcast.c b/src/thread/pthread_cond_broadcast.c
index 3daa7817..848e288f 100644
--- a/src/thread/pthread_cond_broadcast.c
+++ b/src/thread/pthread_cond_broadcast.c
@@ -1,47 +1,39 @@
 #include "pthread_impl.h"
 
-static void unlock(pthread_cond_t *c)
-{
-	a_dec(&c->_c_bcast);
-	if (c->_c_leavers) __wake(&c->_c_bcast, -1, 0);
-}
-
 int pthread_cond_broadcast(pthread_cond_t *c)
 {
 	pthread_mutex_t *m;
-	int w;
 
 	if (!c->_c_waiters) return 0;
-	a_inc(&c->_c_bcast);
-	if (!c->_c_waiters) {
-		unlock(c);
-		return 0;
-	}
 
-	a_store(&c->_c_block, 0);
+	a_inc(&c->_c_seq);
 
-	m = c->_c_mutex;
-
-	/* If mutex ptr is not available, simply wake all waiters. */
-	if (m == (void *)-1) {
-		unlock(c);
-		__wake(&c->_c_block, -1, 0);
+	/* If cond var is process-shared, simply wake all waiters. */
+	if (c->_c_mutex == (void *)-1) {
+		__wake(&c->_c_seq, -1, 0);
 		return 0;
 	}
 
+	/* Block waiters from returning so we can use the mutex. */
+	while (a_swap(&c->_c_lock, 1))
+		__wait(&c->_c_lock, &c->_c_lockwait, 1, 1);
+	if (!c->_c_waiters)
+		goto out;
+	m = c->_c_mutex;
+
 	/* Move waiter count to the mutex */
-	for (;;) {
-		w = c->_c_waiters;
-		a_fetch_add(&m->_m_waiters, w);
-		if (a_cas(&c->_c_waiters, w, 0) == w) break;
-		a_fetch_add(&m->_m_waiters, -w);
-	}
+	a_fetch_add(&m->_m_waiters, c->_c_waiters2);
+	c->_c_waiters2 = 0;
+
+	/* Perform the futex requeue, waking one waiter unless we know
+	 * that the calling thread holds the mutex. */
+	__syscall(SYS_futex, &c->_c_seq, FUTEX_REQUEUE,
+		!m->_m_type || (m->_m_lock&INT_MAX)!=pthread_self()->tid,
+		INT_MAX, &m->_m_lock);
 
-	/* Perform the futex requeue, waking one waiter if and only if
-	 * the calling thread does not hold the mutex. */
-	__syscall(SYS_futex, &c->_c_block, FUTEX_REQUEUE,
-		m->_m_lock!=pthread_self()->tid, INT_MAX, &m->_m_lock);
+out:
+	a_store(&c->_c_lock, 0);
+	if (c->_c_lockwait) __wake(&c->_c_lock, 1, 0);
 
-	unlock(c);
 	return 0;
 }