X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_cond_timedwait.c;h=1439aace15de557cb9c22e35a045c5353b857b15;hb=fd80cfa00b34ec81b3049b98c66f6a45301ca6c4;hp=b0214b40a88068375d4011ebe6d604e2d81985a0;hpb=e882756311c7b06e59fcc8e582f03852b7dcfd30;p=musl diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c index b0214b40..1439aace 100644 --- a/src/thread/pthread_cond_timedwait.c +++ b/src/thread/pthread_cond_timedwait.c @@ -8,19 +8,21 @@ 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(0); + CANCELPT_BEGIN; + CANCELPT_END; 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, CLOCK_REALTIME, ts, 0); - CANCELPT(0); + CANCELPT_BEGIN; + e = __timedwait(&c->_c_block, 1, c->_c_clock, ts, 0); + CANCELPT_END; pthread_cleanup_pop(0); if ((r=pthread_mutex_lock(m))) return r; - CANCELPT(0); + CANCELPT_BEGIN; + CANCELPT_END; return e; }