about summary refs log tree commit diff
path: root/src/thread/pthread_cond_destroy.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2014-08-17 22:09:47 -0400
committerRich Felker <dalias@aerifal.cx>2014-08-17 22:09:47 -0400
commit37195db8ec31300a87bc7ec09d2adcf299e9203d (patch)
treef3d2bbb1ced5199a695a03bfb4d42ba06b7bc8a7 /src/thread/pthread_cond_destroy.c
parent4220d298ef7a2226b14fe4b481f7f7699eab6e3f (diff)
downloadmusl-37195db8ec31300a87bc7ec09d2adcf299e9203d.tar.gz
musl-37195db8ec31300a87bc7ec09d2adcf299e9203d.tar.xz
musl-37195db8ec31300a87bc7ec09d2adcf299e9203d.zip
redesign cond var implementation to fix multiple issues
the immediate issue that was reported by Jens Gustedt and needed to be
fixed was corruption of the cv/mutex waiter states when switching to
using a new mutex with the cv after all waiters were unblocked but
before they finished returning from the wait function.

self-synchronized destruction was also handled poorly and may have had
race conditions. and the use of sequence numbers for waking waiters
admitted a theoretical missed-wakeup if the sequence number wrapped
through the full 32-bit space.

the new implementation is largely documented in the comments in the
source. the basic principle is to use linked lists initially attached
to the cv object, but detachable on signal/broadcast, made up of nodes
residing in automatic storage (stack) on the threads that are waiting.
this eliminates the need for waiters to access the cv object after
they are signaled, and allows us to limit wakeup to one waiter at a
time during broadcasts even when futex requeue cannot be used.

performance is also greatly improved, roughly double some tests.

basically nothing is changed in the process-shared cond var case,
where this implementation does not work, since processes do not have
access to one another's local storage.
Diffstat (limited to 'src/thread/pthread_cond_destroy.c')
-rw-r--r--src/thread/pthread_cond_destroy.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/thread/pthread_cond_destroy.c b/src/thread/pthread_cond_destroy.c
index a096c554..8c555160 100644
--- a/src/thread/pthread_cond_destroy.c
+++ b/src/thread/pthread_cond_destroy.c
@@ -2,12 +2,13 @@
 
 int pthread_cond_destroy(pthread_cond_t *c)
 {
-	int priv = c->_c_mutex != (void *)-1;
-	int cnt;
-	c->_c_destroy = 1;
-	if (c->_c_waiters)
-		__wake(&c->_c_seq, -1, priv);
-	while ((cnt = c->_c_waiters))
-		__wait(&c->_c_waiters, 0, cnt, priv);
+	if (c->_c_shared && c->_c_waiters) {
+		int cnt;
+		a_or(&c->_c_waiters, 0x80000000);
+		a_inc(&c->_c_seq);
+		__wake(&c->_c_seq, -1, 0);
+		while ((cnt = c->_c_waiters) & 0x7fffffff)
+			__wait(&c->_c_waiters, 0, cnt, 0);
+	}
 	return 0;
 }