microblaze port

[musl] / src / thread / pthread_cond_timedwait.c

diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
index 9616dd8..1f25c8e 100644 (file)
--- a/src/thread/pthread_cond_timedwait.c
+++ b/src/thread/pthread_cond_timedwait.c
@@ -7,17 +7,26 @@ struct cm {
 
 static void unwait(pthread_cond_t *c, pthread_mutex_t *m)
 {
-       int w;
+       /* Removing a waiter is non-trivial if we could be using requeue
+        * based broadcast signals, due to mutex access issues, etc. */
 
-       /* Cannot leave waiting status if there are any live broadcasters
-        * which might be inspecting/using the mutex. */
-       while ((w=c->_c_bcast)) __wait(&c->_c_bcast, &c->_c_leavers, w, 0);
+       if (c->_c_mutex == (void *)-1) {
+               a_dec(&c->_c_waiters);
+               if (c->_c_destroy) __wake(&c->_c_waiters, 1, 0);
+               return;
+       }
 
-       /* If the waiter count is zero, it must be the case that the
-        * caller's count has been moved to the mutex due to bcast. */
-       do w = c->_c_waiters;
-       while (w && a_cas(&c->_c_waiters, w, w-1)!=w);
-       if (!w) a_dec(&m->_m_waiters);
+       while (a_swap(&c->_c_lock, 1))
+               __wait(&c->_c_lock, &c->_c_lockwait, 1, 1);
+
+       if (c->_c_waiters2) c->_c_waiters2--;
+       else a_dec(&m->_m_waiters);
+
+       a_store(&c->_c_lock, 0);
+       if (c->_c_lockwait) __wake(&c->_c_lock, 1, 1);
+
+       a_dec(&c->_c_waiters);
+       if (c->_c_destroy) __wake(&c->_c_waiters, 1, 1);
 }
 
 static void cleanup(void *p)
@@ -27,31 +36,41 @@ static void cleanup(void *p)
        pthread_mutex_lock(cm->m);
 }
 
-int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct timespec *ts)
+int pthread_cond_timedwait(pthread_cond_t *restrict c, pthread_mutex_t *restrict m, const struct timespec *restrict ts)
 {
        struct cm cm = { .c=c, .m=m };
-       int r, e, tid;
+       int r, e=0, seq;
+
+       if (m->_m_type && (m->_m_lock&INT_MAX) != pthread_self()->tid)
+               return EPERM;
 
        if (ts && ts->tv_nsec >= 1000000000UL)
                return EINVAL;
 
        pthread_testcancel();
 
-       if (c->_c_mutex != (void *)-1) c->_c_mutex = m;
-
        a_inc(&c->_c_waiters);
-       c->_c_block = tid = pthread_self()->tid;
 
-       if ((r=pthread_mutex_unlock(m))) return r;
+       if (c->_c_mutex != (void *)-1) {
+               c->_c_mutex = m;
+               while (a_swap(&c->_c_lock, 1))
+                       __wait(&c->_c_lock, &c->_c_lockwait, 1, 1);
+               c->_c_waiters2++;
+               a_store(&c->_c_lock, 0);
+               if (c->_c_lockwait) __wake(&c->_c_lock, 1, 1);
+       }
+
+       seq = c->_c_seq;
 
-       do e = __timedwait(&c->_c_block, tid, c->_c_clock, ts, cleanup, &cm, 0);
-       while (c->_c_block == tid && (!e || e==EINTR));
+       pthread_mutex_unlock(m);
+
+       do e = __timedwait(&c->_c_seq, seq, c->_c_clock, ts, cleanup, &cm, 0);
+       while (c->_c_seq == seq && (!e || e==EINTR));
        if (e == EINTR) e = 0;
 
        unwait(c, m);
 
        if ((r=pthread_mutex_lock(m))) return r;
 
-       pthread_testcancel();
        return e;
 }