X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_mutex_lock.c;h=87b19752ee0e4d2845a9e430ae2b60447c4533a4;hb=b2486a8922bf4977bd82c8190258e39de28c053b;hp=6696f17a234b7e571ed8ae5210fc273c2b0ad8db;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/thread/pthread_mutex_lock.c b/src/thread/pthread_mutex_lock.c
index 6696f17a..87b19752 100644
--- a/src/thread/pthread_mutex_lock.c
+++ b/src/thread/pthread_mutex_lock.c
@@ -3,7 +3,16 @@
 int pthread_mutex_lock(pthread_mutex_t *m)
 {
 	int r;
-	while ((r=pthread_mutex_trylock(m)) == EBUSY)
-		__wait(&m->__lock, &m->__waiters, 1, 0);
+
+	if (m->_m_type == PTHREAD_MUTEX_NORMAL && !a_swap(&m->_m_lock, 1))
+		return 0;
+
+	while ((r=pthread_mutex_trylock(m)) == EBUSY) {
+		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, r, 0);
+	}
 	return r;
 }