cuserid: support invocation with a null pointer argument

[musl] / src / thread / sem_timedwait.c

diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index ad3bf07..58d3ebf 100644 (file)
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -1,23 +1,31 @@
 #include <semaphore.h>
 #include "pthread_impl.h"
 
-int sem_timedwait(sem_t *sem, const struct timespec *at)
+static void cleanup(void *p)
 {
-       int val;
+       a_dec(p);
+}
 
-       for (;;) {
-               if (a_fetch_add(sem->__val, -1) > 0) return 0;
-               val = a_fetch_add(sem->__val, 1)+1;
-               if (val==1) __wake(sem->__val, 1, 0);
-               CANCELPT_BEGIN;
-               if (at && at->tv_nsec >= 1000000000UL) {
-                       errno = EINVAL;
-                       return -1;
-               }
-               if (val <= 0 && __timedwait(sem->__val, val, CLOCK_REALTIME, at, 0) == ETIMEDOUT) {
-                       errno = ETIMEDOUT;
+int sem_timedwait(sem_t *restrict sem, const struct timespec *restrict at)
+{
+       pthread_testcancel();
+
+       if (!sem_trywait(sem)) return 0;
+
+       int spins = 100;
+       while (spins-- && sem->__val[0] <= 0 && !sem->__val[1]) a_spin();
+
+       while (sem_trywait(sem)) {
+               int r;
+               a_inc(sem->__val+1);
+               a_cas(sem->__val, 0, -1);
+               pthread_cleanup_push(cleanup, (void *)(sem->__val+1));
+               r = __timedwait_cp(sem->__val, -1, CLOCK_REALTIME, at, sem->__val[2]);
+               pthread_cleanup_pop(1);
+               if (r) {
+                       errno = r;
                        return -1;
                }
-               CANCELPT_END;
        }
+       return 0;
 }