X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_mutex_unlock.c;h=fdf9fc103ffd857c69c93658265fe86e006a01d9;hb=8c6fc860a97f79146bf5c092d5cfb90fa6d9355a;hp=67aa7ba5d14e1e983e25745f8a1104493b413ff8;hpb=047e434ef5fd5437a74f98f63c40a77a683f7f3f;p=musl

diff --git a/src/thread/pthread_mutex_unlock.c b/src/thread/pthread_mutex_unlock.c
index 67aa7ba5..fdf9fc10 100644
--- a/src/thread/pthread_mutex_unlock.c
+++ b/src/thread/pthread_mutex_unlock.c
@@ -3,22 +3,29 @@
 int pthread_mutex_unlock(pthread_mutex_t *m)
 {
 	pthread_t self;
+	int waiters = m->_m_waiters;
+	int cont;
+	int robust = 0;
 
 	if (m->_m_type != PTHREAD_MUTEX_NORMAL) {
-		self = __pthread_self();
+		if (!m->_m_lock)
+			return EPERM;
+		self = pthread_self();
 		if ((m->_m_lock&0x1fffffff) != self->tid)
-		 	return EPERM;
-		if ((m->_m_type&3) == PTHREAD_MUTEX_RECURSIVE && --m->_m_count)
-			return 0;
+			return EPERM;
+		if ((m->_m_type&3) == PTHREAD_MUTEX_RECURSIVE && m->_m_count)
+			return m->_m_count--, 0;
 		if (m->_m_type >= 4) {
+			robust = 1;
 			self->robust_list.pending = &m->_m_next;
 			*(void **)m->_m_prev = m->_m_next;
 			if (m->_m_next) ((void **)m->_m_next)[-1] = m->_m_prev;
 		}
 	}
-
-	m->_m_lock = 0;
-	if (m->_m_waiters) __wake(&m->_m_lock, 1, 0);
-	if (m->_m_type >= 4) self->robust_list.pending = 0;
+	cont = a_swap(&m->_m_lock, 0);
+	if (robust)
+		self->robust_list.pending = 0;
+	if (waiters || cont<0)
+		__wake(&m->_m_lock, 1, 0);
 	return 0;
 }