diff options
Diffstat (limited to 'nptl/pthread_cond_wait.c')
| -rw-r--r-- | nptl/pthread_cond_wait.c | 44 |
1 files changed, 38 insertions, 6 deletions
diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c index 7385562f57..558f930cd2 100644 --- a/nptl/pthread_cond_wait.c +++ b/nptl/pthread_cond_wait.c @@ -378,6 +378,7 @@ __condvar_cleanup_waiting (void *arg) */ static __always_inline int __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, + clockid_t clockid, const struct timespec *abstime) { const int maxspin = 0; @@ -386,6 +387,11 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, LIBC_PROBE (cond_wait, 2, cond, mutex); + /* clockid will already have been checked by + __pthread_cond_clockwait or pthread_condattr_setclock, or we + don't use it if abstime is NULL, so we don't need to check it + here. */ + /* Acquire a position (SEQ) in the waiter sequence (WSEQ). We use an atomic operation because signals and broadcasts may update the group switch without acquiring the mutex. We do not need release MO here @@ -511,10 +517,6 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, err = ETIMEDOUT; else { - const clockid_t clockid = - ((flags & __PTHREAD_COND_CLOCK_MONOTONIC_MASK) != 0) ? - CLOCK_MONOTONIC : CLOCK_REALTIME; - err = futex_abstimed_wait_cancelable (cond->__data.__g_signals + g, 0, clockid, abstime, private); @@ -632,7 +634,8 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, int __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex) { - return __pthread_cond_wait_common (cond, mutex, NULL); + /* clockid is unused when abstime is NULL. */ + return __pthread_cond_wait_common (cond, mutex, 0, NULL); } /* See __pthread_cond_wait_common. */ @@ -644,10 +647,39 @@ __pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex, it can assume that abstime is not NULL. */ if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) return EINVAL; - return __pthread_cond_wait_common (cond, mutex, abstime); + + /* Relaxed MO is suffice because clock ID bit is only modified + in condition creation. */ + unsigned int flags = atomic_load_relaxed (&cond->__data.__wrefs); + clockid_t clockid = (flags & __PTHREAD_COND_CLOCK_MONOTONIC_MASK) + ? CLOCK_MONOTONIC : CLOCK_REALTIME; + return __pthread_cond_wait_common (cond, mutex, clockid, abstime); +} + +/* See __pthread_cond_wait_common. */ +int +__pthread_cond_clockwait (pthread_cond_t *cond, pthread_mutex_t *mutex, + clockid_t clockid, + const struct timespec *abstime) +{ + /* Check parameter validity. This should also tell the compiler that + it can assume that abstime is not NULL. */ + if (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) + return EINVAL; + + if (!futex_abstimed_supported_clockid (clockid)) + return EINVAL; + + /* If we do not support waiting using CLOCK_MONOTONIC, return an error. */ + if (clockid == CLOCK_MONOTONIC + && !futex_supports_exact_relative_timeouts ()) + return EINVAL; + + return __pthread_cond_wait_common (cond, mutex, clockid, abstime); } versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, GLIBC_2_3_2); versioned_symbol (libpthread, __pthread_cond_timedwait, pthread_cond_timedwait, GLIBC_2_3_2); +weak_alias (__pthread_cond_clockwait, pthread_cond_clockwait); |