#include "pthread_impl.h"
-static void relock(void *m)
+struct cm {
+ pthread_cond_t *c;
+ pthread_mutex_t *m;
+};
+
+static void cleanup(void *p)
{
- pthread_mutex_lock(m);
+ struct cm *cm = p;
+ a_dec(&cm->c->_c_waiters);
+ pthread_mutex_lock(cm->m);
}
int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct timespec *ts)
{
+ struct cm cm = { .c=c, .m=m };
int r, e=0;
- CANCELPT_BEGIN;
- CANCELPT_END;
- pthread_cleanup_push(relock, m);
+ if (ts && ts->tv_nsec >= 1000000000UL)
+ return EINVAL;
+
+ pthread_testcancel();
+
c->_c_block = 1;
if ((r=pthread_mutex_unlock(m))) return r;
- CANCELPT_BEGIN;
- e = __timedwait(&c->_c_block, 1, c->_c_clock, ts, 0);
- CANCELPT_END;
+ a_inc(&c->_c_waiters);
+ do e = __timedwait(&c->_c_block, 1, c->_c_clock, ts, cleanup, &cm, 0);
+ while (e == EINTR);
+ a_dec(&c->_c_waiters);
- pthread_cleanup_pop(0);
if ((r=pthread_mutex_lock(m))) return r;
- CANCELPT_BEGIN;
- CANCELPT_END;
+ pthread_testcancel();
return e;
}