about summary refs log tree commit diff
path: root/src/thread/pthread_mutex_unlock.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/thread/pthread_mutex_unlock.c')
-rw-r--r--src/thread/pthread_mutex_unlock.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/thread/pthread_mutex_unlock.c b/src/thread/pthread_mutex_unlock.c
index 3733788d..67aa7ba5 100644
--- a/src/thread/pthread_mutex_unlock.c
+++ b/src/thread/pthread_mutex_unlock.c
@@ -2,14 +2,23 @@
 
 int pthread_mutex_unlock(pthread_mutex_t *m)
 {
+	pthread_t self;
+
 	if (m->_m_type != PTHREAD_MUTEX_NORMAL) {
-		if (!m->_m_lock || m->_m_lock != __pthread_self()->tid)
+		self = __pthread_self();
+		if ((m->_m_lock&0x1fffffff) != self->tid)
 		 	return EPERM;
-		if (m->_m_type == PTHREAD_MUTEX_RECURSIVE && --m->_m_count)
+		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;
+		}
 	}
 
 	m->_m_lock = 0;
 	if (m->_m_waiters) __wake(&m->_m_lock, 1, 0);
+	if (m->_m_type >= 4) self->robust_list.pending = 0;
 	return 0;
 }