From: Rich Felker <dalias@aerifal.cx>
Date: Sun, 25 Sep 2011 06:56:01 +0000 (-0400)
Subject: fix logic for when wakeup is not desired on cond bcast
X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=09ec0f3aab4df2993f4a2a992529655f6c4f7a70

fix logic for when wakeup is not desired on cond bcast

somehow i forgot that normal-type mutexes don't store the owner tid.
---

diff --git a/src/thread/pthread_cond_broadcast.c b/src/thread/pthread_cond_broadcast.c
index 3daa7817..7e5ea91c 100644
--- a/src/thread/pthread_cond_broadcast.c
+++ b/src/thread/pthread_cond_broadcast.c
@@ -37,10 +37,11 @@ int pthread_cond_broadcast(pthread_cond_t *c)
 		a_fetch_add(&m->_m_waiters, -w);
 	}
 
-	/* Perform the futex requeue, waking one waiter if and only if
-	 * the calling thread does not hold the mutex. */
+	/* Perform the futex requeue, waking one waiter unless we know
+	 * that the calling thread holds the mutex. */
 	__syscall(SYS_futex, &c->_c_block, FUTEX_REQUEUE,
-		m->_m_lock!=pthread_self()->tid, INT_MAX, &m->_m_lock);
+		!m->_m_type || (m->_m_lock&INT_MAX)!=pthread_self()->tid,
+		INT_MAX, &m->_m_lock);
 
 	unlock(c);
 	return 0;