fix pshared barrier wrong return value.

[musl] / src / thread / pthread_cond_timedwait.c

diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
index e9b5e2f..db2744b 100644 (file)
--- a/src/thread/pthread_cond_timedwait.c
+++ b/src/thread/pthread_cond_timedwait.c
@@ -18,7 +18,7 @@ static void unwait(pthread_cond_t *c, pthread_mutex_t *m)
        while (a_swap(&c->_c_lock, 1))
                __wait(&c->_c_lock, &c->_c_lockwait, 1, 1);
 
-       if (c->_c_waiters) c->_c_waiters--;
+       if (c->_c_waiters2) c->_c_waiters2--;
        else a_dec(&m->_m_waiters);
 
        a_store(&c->_c_lock, 0);
@@ -42,13 +42,13 @@ int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct t
 
        pthread_testcancel();
 
-       if (c->_c_mutex == (void *)-1) {
-               a_inc(&c->_c_waiters);
-       } else {
+       a_inc(&c->_c_waiters);
+
+       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_waiters++;
+               c->_c_waiters2++;
                a_store(&c->_c_lock, 0);
                if (c->_c_lockwait) __wake(&c->_c_lock, 1, 1);
        }