X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_cond_timedwait.c;h=ec5aa6f467c1bae07b70f8ba805f7bfc97cde612;hp=13728282df2313b8b4ae2f1b19cac0a6ec2c5861;hb=4b153ac42428447a148e6da543ebe6df017078db;hpb=feee98903cd8119d9a3db62589246a940f44a9f5

diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
index 13728282..ec5aa6f4 100644
--- a/src/thread/pthread_cond_timedwait.c
+++ b/src/thread/pthread_cond_timedwait.c
@@ -1,24 +1,35 @@
 #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;
 
+	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);
+	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;
 
 	pthread_testcancel();