summaryrefslogtreecommitdiff
path: root/src/thread/sem_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/sem_timedwait.c
parentc68de0be2fb649f91b31080224fb6e48084eaaee (diff)
downloadmusl-ec381af90208a5675183202cf05078eac208edfb.tar.gz
musl-ec381af90208a5675183202cf05078eac208edfb.tar.bz2
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/sem_timedwait.c')
-rw-r--r--src/thread/sem_timedwait.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/thread/sem_timedwait.c b/src/thread/sem_timedwait.c
index 1d4b3e2c..4e12389c 100644
--- a/src/thread/sem_timedwait.c
+++ b/src/thread/sem_timedwait.c
@@ -10,15 +10,9 @@ int sem_timedwait(sem_t *sem, const struct timespec *at)
{
while (sem_trywait(sem)) {
int r;
- if (at && at->tv_nsec >= 1000000000UL) {
- errno = EINVAL;
- return -1;
- }
a_inc(sem->__val+1);
a_cas(sem->__val, 0, -1);
- pthread_cleanup_push(cleanup, sem->__val+1);
- r = __timedwait_cp(sem->__val, -1, CLOCK_REALTIME, at, 0);
- pthread_cleanup_pop(1);
+ r = __timedwait(sem->__val, -1, CLOCK_REALTIME, at, cleanup, sem->__val+1, 0);
if (r) {
errno = r;
return -1;