unify and overhaul timed futex waits

[musl] / src / thread / sem_timedwait.c

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index 1d4b3e2..4e12389 100644 (file)
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -10,15 +10,9 @@ int sem_timedwait(sem_t *sem, const struct timespec *at)
 {
        while (sem_trywait(sem)) {
                int r;
-               if (at && at->tv_nsec >= 1000000000UL) {
-                       errno = EINVAL;
-                       return -1;
-               }
                a_inc(sem->__val+1);
                a_cas(sem->__val, 0, -1);
-               pthread_cleanup_push(cleanup, sem->__val+1);
-               r = __timedwait_cp(sem->__val, -1, CLOCK_REALTIME, at, 0);
-               pthread_cleanup_pop(1);
+               r = __timedwait(sem->__val, -1, CLOCK_REALTIME, at, cleanup, sem->__val+1, 0);
                if (r) {
                        errno = r;
                        return -1;