X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_mutex_lock.c;h=99c15bd8f6f649c79f61c807341d049b878a3396;hp=82556141e463b8a9a0d7ea4f7dcacebf5c296bdd;hb=ec2e50d0d78fb19c4a0b6f3e1d394408860425b4;hpb=d4f9e0b3642a81d07c95302cd9aa0dcaf7de1a05

diff --git a/src/thread/pthread_mutex_lock.c b/src/thread/pthread_mutex_lock.c
index 82556141..99c15bd8 100644
--- a/src/thread/pthread_mutex_lock.c
+++ b/src/thread/pthread_mutex_lock.c
@@ -3,11 +3,16 @@
 int pthread_mutex_lock(pthread_mutex_t *m)
 {
 	int r;
+
+	if (m->_m_type == PTHREAD_MUTEX_NORMAL && !a_swap(&m->_m_lock, EBUSY))
+		return 0;
+
 	while ((r=pthread_mutex_trylock(m)) == EBUSY) {
-		if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK
-		 && m->_m_owner == pthread_self()->tid)
+		if (!(r=m->_m_lock) || (r&0x40000000)) continue;
+		if ((m->_m_type&3) == PTHREAD_MUTEX_ERRORCHECK
+		 && (r&0x1fffffff) == pthread_self()->tid)
 			return EDEADLK;
-		__wait(&m->_m_lock, &m->_m_waiters, 1, 0);
+		__wait(&m->_m_lock, &m->_m_waiters, r, 0);
 	}
 	return r;
 }