add new masked cancellation mode

[musl] / src / thread / pthread_mutex_timedlock.c

diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c
index 849febb..16241ee 100644 (file)
--- a/src/thread/pthread_mutex_timedlock.c
+++ b/src/thread/pthread_mutex_timedlock.c
@@ -1,6 +1,6 @@
 #include "pthread_impl.h"
 
-int pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec *restrict at)
+int __pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec *restrict at)
 {
        if ((m->_m_type&15) == PTHREAD_MUTEX_NORMAL
            && !a_cas(&m->_m_lock, 0, EBUSY))
@@ -8,10 +8,17 @@ int pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec *
 
        int r, t, priv = (m->_m_type & 128) ^ 128;
 
+       r = pthread_mutex_trylock(m);
+       if (r != EBUSY) return r;
+       
+       int spins = 100;
+       while (spins-- && m->_m_lock && !m->_m_waiters) a_spin();
+
        while ((r=pthread_mutex_trylock(m)) == EBUSY) {
-               if (!(r=m->_m_lock) || (r&0x40000000)) continue;
+               if (!(r=m->_m_lock) || ((r&0x40000000) && (m->_m_type&4)))
+                       continue;
                if ((m->_m_type&3) == PTHREAD_MUTEX_ERRORCHECK
-                && (r&0x1fffffff) == __pthread_self()->tid)
+                && (r&0x7fffffff) == __pthread_self()->tid)
                        return EDEADLK;
 
                a_inc(&m->_m_waiters);
@@ -23,3 +30,5 @@ int pthread_mutex_timedlock(pthread_mutex_t *restrict m, const struct timespec *
        }
        return r;
 }
+
+weak_alias(__pthread_mutex_timedlock, pthread_mutex_timedlock);