X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_mutex_unlock.c;h=5fc0f4e56be4d2c321cbd0b04afc40c05c25859a;hp=0f4a5e6cccc036e03d3bd0feb2f928517dfc0851;hb=da8d0fc4fa3490f418a438b7e0830f9af312d41f;hpb=c68de0be2fb649f91b31080224fb6e48084eaaee

diff --git a/src/thread/pthread_mutex_unlock.c b/src/thread/pthread_mutex_unlock.c
index 0f4a5e6c..5fc0f4e5 100644
--- a/src/thread/pthread_mutex_unlock.c
+++ b/src/thread/pthread_mutex_unlock.c
@@ -1,30 +1,36 @@
 #include "pthread_impl.h"
 
+void __vm_lock_impl(int);
+void __vm_unlock_impl(void);
+
 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) {
 		if (!m->_m_lock)
 			return EPERM;
-		self = __pthread_self();
+		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&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;
-			cont = a_swap(&m->_m_lock, 0);
-			self->robust_list.pending = 0;
-			goto wake;
+			__vm_lock_impl(+1);
 		}
 	}
 	cont = a_swap(&m->_m_lock, 0);
-wake:
+	if (robust) {
+		self->robust_list.pending = 0;
+		__vm_unlock_impl();
+	}
 	if (waiters || cont<0)
 		__wake(&m->_m_lock, 1, 0);
 	return 0;