X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_mutex_lock.c;h=d0c93cab50119feee0741b14006f346f000b87c6;hb=8c316e9e49d37ad92c2e7493e16166a2afca419f;hp=15ede3f5abdbe75edac86fdfd6ae8da7688bf472;hpb=e882756311c7b06e59fcc8e582f03852b7dcfd30;p=musl

diff --git a/src/thread/pthread_mutex_lock.c b/src/thread/pthread_mutex_lock.c
index 15ede3f5..d0c93cab 100644
--- a/src/thread/pthread_mutex_lock.c
+++ b/src/thread/pthread_mutex_lock.c
@@ -1,9 +1,14 @@
 #include "pthread_impl.h"
 
-int pthread_mutex_lock(pthread_mutex_t *m)
+int __pthread_mutex_timedlock(pthread_mutex_t *restrict, const struct timespec *restrict);
+
+int __pthread_mutex_lock(pthread_mutex_t *m)
 {
-	int r;
-	while ((r=pthread_mutex_trylock(m)) == EBUSY)
-		__wait(&m->_m_lock, &m->_m_waiters, 1, 0);
-	return r;
+	if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL
+	    && !a_cas(&m->_m_lock, 0, EBUSY))
+		return 0;
+
+	return __pthread_mutex_timedlock(m, 0);
 }
+
+weak_alias(__pthread_mutex_lock, pthread_mutex_lock);