X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_mutex_trylock.c;h=2dad7bbf19a9752368d894f35f59a328bfb1d34c;hb=ac12eb91bd7aa6f1f1642de1350c4f29ea0f4d08;hp=1e3817bbf8960fc53f36bba70c8f9c6171985e0a;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/thread/pthread_mutex_trylock.c b/src/thread/pthread_mutex_trylock.c
index 1e3817bb..2dad7bbf 100644
--- a/src/thread/pthread_mutex_trylock.c
+++ b/src/thread/pthread_mutex_trylock.c
@@ -2,27 +2,23 @@
 
 int pthread_mutex_trylock(pthread_mutex_t *m)
 {
-	if (m->__type == PTHREAD_MUTEX_RECURSIVE) {
-		pthread_t self = pthread_self();
-		if (m->__owner == self) {
-			if ((unsigned)m->__lock >= INT_MAX) return EAGAIN;
-			a_inc(&m->__lock);
-			return 0;
-		}
-		if (a_fetch_add(&m->__lock, 1)) {
-			if (a_fetch_add(&m->__lock, -1)==1 && m->__waiters)
-				__wake(&m->__lock, 1, 0);
-			return EBUSY;
-		}
-		m->__owner = self;
+	int tid;
+
+	if (m->_m_type == PTHREAD_MUTEX_NORMAL)
+		return -a_xchg(&m->_m_lock, 1) & EBUSY;
+
+	tid = pthread_self()->tid;
+
+	if (m->_m_owner == tid) {
+		if (m->_m_type != PTHREAD_MUTEX_RECURSIVE)
+			return EDEADLK;
+		if ((unsigned)m->_m_count >= INT_MAX) return EAGAIN;
+		m->_m_count++;
 		return 0;
 	}
 
-	if (a_xchg(&m->__lock, 1))
-		if (m->__type == PTHREAD_MUTEX_ERRORCHECK
-		 && m->__owner == pthread_self()) return EDEADLK;
-		else return EBUSY;
-	if (m->__type == PTHREAD_MUTEX_ERRORCHECK)
-		m->__owner = pthread_self();
+	if (a_xchg(&m->_m_lock, 1)) return EBUSY;
+	m->_m_owner = tid;
+	m->_m_count = 1;
 	return 0;
 }