X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_cond_timedwait.c;h=ee874a3601ef6b2350cbbdc92a877e8bdc9c227b;hp=1439aace15de557cb9c22e35a045c5353b857b15;hb=d5fd1fa48564a5528f53e5b1cab5063a0545d7f7;hpb=b470030f839a375e5030ec9d44903ef7581c15a2

diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
index 1439aace..ee874a36 100644
--- a/src/thread/pthread_cond_timedwait.c
+++ b/src/thread/pthread_cond_timedwait.c
@@ -8,21 +8,20 @@ static void relock(void *m)
 int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct timespec *ts)
 {
 	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;
+	do e = __timedwait(&c->_c_block, 1, c->_c_clock, ts, relock, m, 0);
+	while (e == EINTR);
 
-	pthread_cleanup_pop(0);
 	if ((r=pthread_mutex_lock(m))) return r;
 
-	CANCELPT_BEGIN;
-	CANCELPT_END;
+	pthread_testcancel();
 	return e;
 }