about summary refs log tree commit diff
path: root/src/thread/pthread_cond_timedwait.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-08-02 21:11:36 -0400
committerRich Felker <dalias@aerifal.cx>2011-08-02 21:11:36 -0400
commitec381af90208a5675183202cf05078eac208edfb (patch)
tree26005bfd6a3b4f7b4788183d89ec1c2769bd2022 /src/thread/pthread_cond_timedwait.c
parentc68de0be2fb649f91b31080224fb6e48084eaaee (diff)
downloadmusl-ec381af90208a5675183202cf05078eac208edfb.tar.gz
musl-ec381af90208a5675183202cf05078eac208edfb.tar.xz
musl-ec381af90208a5675183202cf05078eac208edfb.zip
unify and overhaul timed futex waits
new features:

- FUTEX_WAIT_BITSET op will be used for timed waits if available. this
  saves a call to clock_gettime.

- error checking for the timespec struct is now inside __timedwait so
  it doesn't need to be duplicated everywhere. cond_timedwait still
  needs to duplicate it to avoid unlocking the mutex, though.

- pushing and popping the cancellation handler is delegated to
  __timedwait, and cancellable/non-cancellable waits are unified.
Diffstat (limited to 'src/thread/pthread_cond_timedwait.c')
-rw-r--r--src/thread/pthread_cond_timedwait.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
index 13728282..ee874a36 100644
--- a/src/thread/pthread_cond_timedwait.c
+++ b/src/thread/pthread_cond_timedwait.c
@@ -9,16 +9,17 @@ int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct t
 {
 	int r, e=0;
 
+	if (ts && ts->tv_nsec >= 1000000000UL)
+		return EINVAL;
+
 	pthread_testcancel();
 
-	pthread_cleanup_push(relock, m);
 	c->_c_block = 1;
 	if ((r=pthread_mutex_unlock(m))) return r;
 
-	do e = __timedwait_cp(&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);
 
-	pthread_cleanup_pop(0);
 	if ((r=pthread_mutex_lock(m))) return r;
 
 	pthread_testcancel();