projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix stubbed-out reboot call
[musl]
/
src
/
thread
/
pthread_cond_timedwait.c
diff --git
a/src/thread/pthread_cond_timedwait.c
b/src/thread/pthread_cond_timedwait.c
index
7a19fc5
..
ee874a3
100644
(file)
--- a/
src/thread/pthread_cond_timedwait.c
+++ b/
src/thread/pthread_cond_timedwait.c
@@
-8,22
+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;
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;
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(&c->_c_block, 1, c->_c_clock, ts, relock, m, 0);
while (e == EINTR);
while (e == EINTR);
- CANCELPT_END;
- pthread_cleanup_pop(0);
if ((r=pthread_mutex_lock(m))) return r;
if ((r=pthread_mutex_lock(m))) return r;
- CANCELPT_BEGIN;
- CANCELPT_END;
+ pthread_testcancel();
return e;
}
return e;
}