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

diff --git a/src/thread/pthread_mutex_unlock.c b/src/thread/pthread_mutex_unlock.c
index 23e64ac8..5fc0f4e5 100644
--- a/src/thread/pthread_mutex_unlock.c
+++ b/src/thread/pthread_mutex_unlock.c
@@ -1,19 +1,37 @@
 #include "pthread_impl.h"
 
+void __vm_lock_impl(int);
+void __vm_unlock_impl(void);
+
 int pthread_mutex_unlock(pthread_mutex_t *m)
 {
-	if (m->__type == PTHREAD_MUTEX_RECURSIVE) {
-		if (a_fetch_add(&m->__lock, -1)==1 && m->__waiters)
-			__wake(&m->__lock, 1, 0);
-		return 0;
-	}
-
-	if (m->__type == PTHREAD_MUTEX_ERRORCHECK
-	 && m->__owner != pthread_self())
-	 	return EPERM;
+	pthread_t self;
+	int waiters = m->_m_waiters;
+	int cont;
+	int robust = 0;
 
-	m->__owner = 0;
-	m->__lock = 0;
-	if (m->__waiters) __wake(&m->__lock, 1, 0);
+	if (m->_m_type != PTHREAD_MUTEX_NORMAL) {
+		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 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;
+			__vm_lock_impl(+1);
+		}
+	}
+	cont = a_swap(&m->_m_lock, 0);
+	if (robust) {
+		self->robust_list.pending = 0;
+		__vm_unlock_impl();
+	}
+	if (waiters || cont<0)
+		__wake(&m->_m_lock, 1, 0);
 	return 0;
 }