X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_barrier_wait.c;h=9b1edbf94ad19a46a93fc9d68e497db662148ff4;hp=a97f6d56a0f3ba1eae0042cce194644557b8b763;hb=95b147967216a057d51a1b970da777486be716e3;hpb=8f4a115e7d38c31ad8d8c7233eaff2db270aebd8

diff --git a/src/thread/pthread_barrier_wait.c b/src/thread/pthread_barrier_wait.c
index a97f6d56..9b1edbf9 100644
--- a/src/thread/pthread_barrier_wait.c
+++ b/src/thread/pthread_barrier_wait.c
@@ -23,11 +23,12 @@ static int pshared_barrier_wait(pthread_barrier_t *b)
 	int limit = (b->_b_limit & INT_MAX) + 1;
 	int seq;
 	int ret = 0;
+	int v, w;
 
 	if (limit==1) return PTHREAD_BARRIER_SERIAL_THREAD;
 
-	while (a_swap(&b->_b_lock, 1))
-		__wait(&b->_b_lock, &b->_b_waiters, 1, 0);
+	while ((v=a_cas(&b->_b_lock, 0, limit)))
+		__wait(&b->_b_lock, &b->_b_waiters, v, 0);
 
 	seq = b->_b_seq;
 
@@ -46,12 +47,19 @@ static int pshared_barrier_wait(pthread_barrier_t *b)
 	if (a_fetch_add(&b->_b_count, -1)==1) {
 		b->_b_seq++;
 		__wake(&b->_b_seq, -1, 0);
-		a_store(&b->_b_lock, 0);
-		if (b->_b_waiters) __wake(&b->_b_lock, 1, 0);
 	} else {
 		__wait(&b->_b_seq, 0, seq+1, 0);
 	}
 	
+	/* Perform a recursive unlock suitable for self-sync'd destruction */
+	do {
+		v = b->_b_lock;
+		w = b->_b_waiters;
+	} while (a_cas(&b->_b_lock, v, v-1 & INT_MAX) != v);
+
+	if (v==INT_MIN+1 || (v==1 && w))
+		__wake(&b->_b_lock, 1, 0);
+
 	__vm_unlock();
 
 	return ret;