X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_mutex_unlock.c;h=0f4a5e6cccc036e03d3bd0feb2f928517dfc0851;hp=39cea4b6d4fc0a9b45f43aa6671c51380f6a2031;hb=d5fd1fa48564a5528f53e5b1cab5063a0545d7f7;hpb=4820f9268d3dc1f2aac923de0a591ffd5d54ea89

diff --git a/src/thread/pthread_mutex_unlock.c b/src/thread/pthread_mutex_unlock.c
index 39cea4b6..0f4a5e6c 100644
--- a/src/thread/pthread_mutex_unlock.c
+++ b/src/thread/pthread_mutex_unlock.c
@@ -2,15 +2,30 @@
 
 int pthread_mutex_unlock(pthread_mutex_t *m)
 {
+	pthread_t self;
+	int waiters = m->_m_waiters;
+	int cont;
+
 	if (m->_m_type != PTHREAD_MUTEX_NORMAL) {
-		if (m->_m_owner != pthread_self()->tid)
-		 	return EPERM;
-		if (m->_m_type == PTHREAD_MUTEX_RECURSIVE && --m->_m_count)
+		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;
+		if (m->_m_type >= 4) {
+			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;
+			cont = a_swap(&m->_m_lock, 0);
+			self->robust_list.pending = 0;
+			goto wake;
+		}
 	}
-
-	m->_m_owner = 0;
-	m->_m_lock = 0;
-	if (m->_m_waiters) __wake(&m->_m_lock, 1, 0);
+	cont = a_swap(&m->_m_lock, 0);
+wake:
+	if (waiters || cont<0)
+		__wake(&m->_m_lock, 1, 0);
 	return 0;
 }