X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_cond_timedwait.c;h=c71edc95bc8274473de5056447d384eea9af4c62;hp=228f61f706e4cf03e9bea6ad735db685ce371b34;hb=97c5b5a87c3d9df54278e1073d6177f77536bd32;hpb=5fd4a9816573a3b6a244b73b84ce0cec871321da

diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
index 228f61f7..c71edc95 100644
--- a/src/thread/pthread_cond_timedwait.c
+++ b/src/thread/pthread_cond_timedwait.c
@@ -1,26 +1,40 @@
 #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)
 {
-	int r, e=0;
-	CANCELPT(0);
+	struct cm cm = { .c=c, .m=m };
+	int r, e, tid;
+
+	if (ts && ts->tv_nsec >= 1000000000UL)
+		return EINVAL;
+
+	pthread_testcancel();
+
+	a_inc(&c->_c_waiters);
+	c->_c_block = tid = pthread_self()->tid;
 
-	pthread_cleanup_push(relock, m);
-	c->_c_block = 1;
 	if ((r=pthread_mutex_unlock(m))) return r;
 
-	CANCELPT(1);
-	e = __timedwait(&c->_c_block, 1, c->_c_clock, ts, 0);
-	CANCELPT(0);
+	do e = __timedwait(&c->_c_block, tid, c->_c_clock, ts, cleanup, &cm, 0);
+	while (c->_c_block == tid && (!e || e==EINTR));
+	if (e == EINTR) e = 0;
+
+	a_dec(&c->_c_waiters);
 
-	pthread_cleanup_pop(0);
 	if ((r=pthread_mutex_lock(m))) return r;
 
-	CANCELPT(0);
+	pthread_testcancel();
 	return e;
 }