X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_mutex_lock.c;h=42b5af640c3f7eaf8ff08c85c3700ecaee69f049;hb=7669d1e334e6b96455eece78da43bf830b93d697;hp=15ede3f5abdbe75edac86fdfd6ae8da7688bf472;hpb=e882756311c7b06e59fcc8e582f03852b7dcfd30;p=musl diff --git a/src/thread/pthread_mutex_lock.c b/src/thread/pthread_mutex_lock.c index 15ede3f5..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->_m_lock, &m->_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); }