X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_mutex_lock.c;h=42b5af640c3f7eaf8ff08c85c3700ecaee69f049;hp=6696f17a234b7e571ed8ae5210fc273c2b0ad8db;hb=72768ea99e67162b7b42d9cd8917cf9a2c00f1f1;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01 diff --git a/src/thread/pthread_mutex_lock.c b/src/thread/pthread_mutex_lock.c index 6696f17a..42b5af64 100644 --- a/src/thread/pthread_mutex_lock.c +++ b/src/thread/pthread_mutex_lock.c @@ -2,8 +2,8 @@ int pthread_mutex_lock(pthread_mutex_t *m) { - int r; - while ((r=pthread_mutex_trylock(m)) == EBUSY) - __wait(&m->__lock, &m->__waiters, 1, 0); - return r; + if (m->_m_type == PTHREAD_MUTEX_NORMAL && !a_cas(&m->_m_lock, 0, EBUSY)) + return 0; + + return pthread_mutex_timedlock(m, 0); }