X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_cond_timedwait.c;fp=src%2Fthread%2Fpthread_cond_timedwait.c;h=1439aace15de557cb9c22e35a045c5353b857b15;hp=228f61f706e4cf03e9bea6ad735db685ce371b34;hb=b470030f839a375e5030ec9d44903ef7581c15a2;hpb=095820016689dfdc9141f477a86de22054c86078 diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c index 228f61f7..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); + CANCELPT_BEGIN; e = __timedwait(&c->_c_block, 1, c->_c_clock, ts, 0); - CANCELPT(0); + CANCELPT_END; pthread_cleanup_pop(0); if ((r=pthread_mutex_lock(m))) return r; - CANCELPT(0); + CANCELPT_BEGIN; + CANCELPT_END; return e; }