fix and optimize non-default-type mutex behavior

[musl] / src / thread / pthread_mutex_trylock.c

diff --git a/src/thread/pthread_mutex_trylock.c b/src/thread/pthread_mutex_trylock.c
index 29268fd..7ff4f70 100644 (file)
--- a/src/thread/pthread_mutex_trylock.c
+++ b/src/thread/pthread_mutex_trylock.c
@@ -2,27 +2,24 @@
 
 int pthread_mutex_trylock(pthread_mutex_t *m)
 {
-       if (m->_m_type == PTHREAD_MUTEX_RECURSIVE) {
-               pthread_t self = pthread_self();
-               if (m->_m_owner == self->tid) {
-                       if ((unsigned)m->_m_lock >= INT_MAX) return EAGAIN;
-                       a_inc(&m->_m_lock);
+       pthread_t self;
+       if (m->_m_type != PTHREAD_MUTEX_NORMAL) {
+               self = pthread_self();
+               if (m->_m_type == PTHREAD_MUTEX_RECURSIVE
+                && m->_m_owner == self->tid) {
+                       if ((unsigned)m->_m_count >= INT_MAX) return EAGAIN;
+                       m->_m_count++;
                        return 0;
                }
-               if (a_fetch_add(&m->_m_lock, 1)) {
-                       if (a_fetch_add(&m->_m_lock, -1)==1 && m->_m_waiters)
-                               __wake(&m->_m_lock, 1, 0);
-                       return EBUSY;
-               }
-               m->_m_owner = self->tid;
-               return 0;
        }
 
        if (a_xchg(&m->_m_lock, 1))
                if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK
-                && m->_m_owner == pthread_self()->tid) return EDEADLK;
+                && m->_m_owner == self->tid) return EDEADLK;
                else return EBUSY;
-       if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK)
-               m->_m_owner = pthread_self()->tid;
+       if (m->_m_type != PTHREAD_MUTEX_NORMAL) {
+               m->_m_owner = self->tid;
+               m->_m_count = 1;
+       }
        return 0;
 }