projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
overhaul cancellation to fix resource leaks and dangerous behavior with signals
[musl]
/
src
/
thread
/
pthread_cond_timedwait.c
diff --git
a/src/thread/pthread_cond_timedwait.c
b/src/thread/pthread_cond_timedwait.c
index
228f61f
..
1439aac
100644
(file)
--- 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;
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;
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);
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;
pthread_cleanup_pop(0);
if ((r=pthread_mutex_lock(m))) return r;
- CANCELPT(0);
+ CANCELPT_BEGIN;
+ CANCELPT_END;
return e;
}
return e;
}