simplify setting result on thread cancellation

[oweals/musl.git] / src / thread / pthread_mutex_lock.c

diff --git a/src/thread/pthread_mutex_lock.c b/src/thread/pthread_mutex_lock.c
index 15ede3f5abdbe75edac86fdfd6ae8da7688bf472..87b19752ee0e4d2845a9e430ae2b60447c4533a4 100644 (file)
--- 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->_m_lock, &m->_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;
 }