unify and overhaul timed futex waits

[musl] / src / thread / pthread_cond_timedwait.c

diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
index 1372828..ee874a3 100644 (file)
--- a/src/thread/pthread_cond_timedwait.c
+++ b/src/thread/pthread_cond_timedwait.c
@@ -9,16 +9,17 @@ int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct t
 {
        int r, e=0;
 
+       if (ts && ts->tv_nsec >= 1000000000UL)
+               return EINVAL;
+
        pthread_testcancel();
 
-       pthread_cleanup_push(relock, m);
        c->_c_block = 1;
        if ((r=pthread_mutex_unlock(m))) return r;
 
-       do e = __timedwait_cp(&c->_c_block, 1, c->_c_clock, ts, 0);
+       do e = __timedwait(&c->_c_block, 1, c->_c_clock, ts, relock, m, 0);
        while (e == EINTR);
 
-       pthread_cleanup_pop(0);
        if ((r=pthread_mutex_lock(m))) return r;
 
        pthread_testcancel();