diff options
Diffstat (limited to 'src/thread/pthread_cond_timedwait.c')
| -rw-r--r-- | src/thread/pthread_cond_timedwait.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c index 7a19fc55..13728282 100644 --- a/src/thread/pthread_cond_timedwait.c +++ b/src/thread/pthread_cond_timedwait.c @@ -8,22 +8,19 @@ 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_testcancel(); pthread_cleanup_push(relock, m); c->_c_block = 1; if ((r=pthread_mutex_unlock(m))) return r; - CANCELPT_BEGIN; - do e = __timedwait(&c->_c_block, 1, c->_c_clock, ts, 0); + do e = __timedwait_cp(&c->_c_block, 1, c->_c_clock, ts, 0); while (e == EINTR); - CANCELPT_END; pthread_cleanup_pop(0); if ((r=pthread_mutex_lock(m))) return r; - CANCELPT_BEGIN; - CANCELPT_END; + pthread_testcancel(); return e; } |