Index: stable/12/contrib/netbsd-tests/lib/libpthread/t_cond.c =================================================================== --- stable/12/contrib/netbsd-tests/lib/libpthread/t_cond.c (revision 345500) +++ stable/12/contrib/netbsd-tests/lib/libpthread/t_cond.c (revision 345501) @@ -1,584 +1,676 @@ /* $NetBSD: t_cond.c,v 1.7 2016/07/03 14:24:59 christos Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include __COPYRIGHT("@(#) Copyright (c) 2008\ The NetBSD Foundation, inc. All rights reserved."); __RCSID("$NetBSD: t_cond.c,v 1.7 2016/07/03 14:24:59 christos Exp $"); #include #include #include #include #include #include #include "h_common.h" static pthread_mutex_t mutex; static pthread_cond_t cond; static pthread_mutex_t static_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t static_cond = PTHREAD_COND_INITIALIZER; static int count, share, toggle, total; static void * signal_delay_wait_threadfunc(void *arg) { int *shared = (int *) arg; printf("2: Second thread.\n"); printf("2: Locking mutex\n"); PTHREAD_REQUIRE(pthread_mutex_lock(&mutex)); printf("2: Got mutex.\n"); printf("Shared value: %d. Changing to 0.\n", *shared); *shared = 0; PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex)); PTHREAD_REQUIRE(pthread_cond_signal(&cond)); return NULL; } ATF_TC(signal_delay_wait); ATF_TC_HEAD(signal_delay_wait, tc) { atf_tc_set_md_var(tc, "descr", "Checks condition variables"); } ATF_TC_BODY(signal_delay_wait, tc) { pthread_t new; void *joinval; int sharedval; printf("1: condition variable test 1\n"); PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL)); PTHREAD_REQUIRE(pthread_cond_init(&cond, NULL)); PTHREAD_REQUIRE(pthread_mutex_lock(&mutex)); sharedval = 1; PTHREAD_REQUIRE(pthread_create(&new, NULL, signal_delay_wait_threadfunc, &sharedval)); printf("1: Before waiting.\n"); do { sleep(2); PTHREAD_REQUIRE(pthread_cond_wait(&cond, &mutex)); printf("1: After waiting, in loop.\n"); } while (sharedval != 0); printf("1: After the loop.\n"); PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex)); printf("1: After releasing the mutex.\n"); PTHREAD_REQUIRE(pthread_join(new, &joinval)); printf("1: Thread joined.\n"); } static void * signal_before_unlock_threadfunc(void *arg) { int *shared = (int *) arg; printf("2: Second thread.\n"); printf("2: Locking mutex\n"); PTHREAD_REQUIRE(pthread_mutex_lock(&mutex)); printf("2: Got mutex.\n"); printf("Shared value: %d. Changing to 0.\n", *shared); *shared = 0; /* Signal first, then unlock, for a different test than #1. */ PTHREAD_REQUIRE(pthread_cond_signal(&cond)); PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex)); return NULL; } ATF_TC(signal_before_unlock); ATF_TC_HEAD(signal_before_unlock, tc) { atf_tc_set_md_var(tc, "descr", "Checks condition variables: signal before unlocking mutex"); } ATF_TC_BODY(signal_before_unlock, tc) { pthread_t new; void *joinval; int sharedval; printf("1: condition variable test 2\n"); PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL)); PTHREAD_REQUIRE(pthread_cond_init(&cond, NULL)); PTHREAD_REQUIRE(pthread_mutex_lock(&mutex)); sharedval = 1; PTHREAD_REQUIRE(pthread_create(&new, NULL, signal_before_unlock_threadfunc, &sharedval)); printf("1: Before waiting.\n"); do { sleep(2); PTHREAD_REQUIRE(pthread_cond_wait(&cond, &mutex)); printf("1: After waiting, in loop.\n"); } while (sharedval != 0); printf("1: After the loop.\n"); PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex)); printf("1: After releasing the mutex.\n"); PTHREAD_REQUIRE(pthread_join(new, &joinval)); printf("1: Thread joined.\n"); } static void * signal_before_unlock_static_init_threadfunc(void *arg) { int *shared = (int *) arg; printf("2: Second thread.\n"); printf("2: Locking mutex\n"); PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex)); printf("2: Got mutex.\n"); printf("Shared value: %d. Changing to 0.\n", *shared); *shared = 0; /* Signal first, then unlock, for a different test than #1. */ PTHREAD_REQUIRE(pthread_cond_signal(&static_cond)); PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex)); return NULL; } ATF_TC(signal_before_unlock_static_init); ATF_TC_HEAD(signal_before_unlock_static_init, tc) { atf_tc_set_md_var(tc, "descr", "Checks condition variables: signal before unlocking " "mutex, use static initializers"); } ATF_TC_BODY(signal_before_unlock_static_init, tc) { pthread_t new; void *joinval; int sharedval; printf("1: condition variable test 3\n"); PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex)); sharedval = 1; PTHREAD_REQUIRE(pthread_create(&new, NULL, signal_before_unlock_static_init_threadfunc, &sharedval)); printf("1: Before waiting.\n"); do { sleep(2); PTHREAD_REQUIRE(pthread_cond_wait(&static_cond, &static_mutex)); printf("1: After waiting, in loop.\n"); } while (sharedval != 0); printf("1: After the loop.\n"); PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex)); printf("1: After releasing the mutex.\n"); PTHREAD_REQUIRE(pthread_join(new, &joinval)); printf("1: Thread joined.\n"); } static void * signal_wait_race_threadfunc(void *arg) { printf("2: Second thread.\n"); PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex)); printf("2: Before the loop.\n"); while (count>0) { count--; total++; toggle = 0; /* printf("2: Before signal %d.\n", count); */ PTHREAD_REQUIRE(pthread_cond_signal(&static_cond)); do { PTHREAD_REQUIRE(pthread_cond_wait(&static_cond, &static_mutex)); } while (toggle != 1); } printf("2: After the loop.\n"); PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex)); return NULL; } ATF_TC(signal_wait_race); ATF_TC_HEAD(signal_wait_race, tc) { atf_tc_set_md_var(tc, "descr", "Checks condition variables"); } ATF_TC_BODY(signal_wait_race, tc) { pthread_t new; void *joinval; int sharedval; printf("1: condition variable test 4\n"); PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex)); count = 50000; toggle = 0; PTHREAD_REQUIRE(pthread_create(&new, NULL, signal_wait_race_threadfunc, &sharedval)); printf("1: Before waiting.\n"); while (count>0) { count--; total++; toggle = 1; /* printf("1: Before signal %d.\n", count); */ PTHREAD_REQUIRE(pthread_cond_signal(&static_cond)); do { PTHREAD_REQUIRE(pthread_cond_wait(&static_cond, &static_mutex)); } while (toggle != 0); } printf("1: After the loop.\n"); toggle = 1; PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex)); PTHREAD_REQUIRE(pthread_cond_signal(&static_cond)); printf("1: After releasing the mutex.\n"); PTHREAD_REQUIRE(pthread_join(new, &joinval)); printf("1: Thread joined. Final count = %d, total = %d\n", count, total); ATF_REQUIRE_EQ(count, 0); ATF_REQUIRE_EQ(total, 50000); } static void * pthread_cond_timedwait_func(void *arg) { struct timespec ts; size_t i = 0; int rv; for (;;) { if (i++ >= 10000) pthread_exit(NULL); (void)memset(&ts, 0, sizeof(struct timespec)); ATF_REQUIRE(clock_gettime(CLOCK_REALTIME, &ts) == 0); /* * Set to one second in the past: * pthread_cond_timedwait(3) should * return ETIMEDOUT immediately. */ ts.tv_sec = ts.tv_sec - 1; PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex)); rv = pthread_cond_timedwait(&static_cond, &static_mutex, &ts); /* * Sometimes we catch ESRCH. * This should never happen. */ ATF_REQUIRE(rv == ETIMEDOUT); PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex)); } } ATF_TC(cond_timedwait_race); ATF_TC_HEAD(cond_timedwait_race, tc) { atf_tc_set_md_var(tc, "descr", "Test pthread_cond_timedwait(3)"); } ATF_TC_BODY(cond_timedwait_race, tc) { pthread_t tid[64]; size_t i; for (i = 0; i < __arraycount(tid); i++) { PTHREAD_REQUIRE(pthread_create(&tid[i], NULL, pthread_cond_timedwait_func, NULL)); } for (i = 0; i < __arraycount(tid); i++) { PTHREAD_REQUIRE(pthread_join(tid[i], NULL)); } } static void * broadcast_threadfunc(void *arg) { printf("2: Second thread.\n"); PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex)); while (count>0) { count--; total++; toggle = 0; PTHREAD_REQUIRE(pthread_cond_signal(&static_cond)); do { PTHREAD_REQUIRE(pthread_cond_wait(&static_cond, &static_mutex)); } while (toggle != 1); } printf("2: After the loop.\n"); PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex)); return NULL; } ATF_TC(broadcast); ATF_TC_HEAD(broadcast, tc) { atf_tc_set_md_var(tc, "descr", "Checks condition variables: use pthread_cond_broadcast()"); } ATF_TC_BODY(broadcast, tc) { pthread_t new; void *joinval; int sharedval; printf("1: condition variable test 5\n"); PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex)); count = 50000; toggle = 0; PTHREAD_REQUIRE(pthread_create(&new, NULL, broadcast_threadfunc, &sharedval)); printf("1: Before waiting.\n"); while (count>0) { count--; total++; toggle = 1; PTHREAD_REQUIRE(pthread_cond_broadcast(&static_cond)); do { PTHREAD_REQUIRE(pthread_cond_wait(&static_cond, &static_mutex)); } while (toggle != 0); } printf("1: After the loop.\n"); toggle = 1; PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex)); PTHREAD_REQUIRE(pthread_cond_signal(&static_cond)); printf("1: After releasing the mutex.\n"); PTHREAD_REQUIRE(pthread_join(new, &joinval)); printf("1: Thread joined. Final count = %d, total = %d\n", count, total); ATF_REQUIRE_EQ(count, 0); ATF_REQUIRE_EQ(total, 50000); } static void * bogus_timedwaits_threadfunc(void *arg) { return NULL; } ATF_TC(bogus_timedwaits); ATF_TC_HEAD(bogus_timedwaits, tc) { atf_tc_set_md_var(tc, "descr", "Checks condition variables: bogus timedwaits"); } ATF_TC_BODY(bogus_timedwaits, tc) { pthread_t new; struct timespec ts; struct timeval tv; printf("condition variable test 6: bogus timedwaits\n"); PTHREAD_REQUIRE(pthread_mutex_lock(&static_mutex)); printf("unthreaded test (past)\n"); gettimeofday(&tv, NULL); tv.tv_sec -= 2; /* Place the time in the past */ TIMEVAL_TO_TIMESPEC(&tv, &ts); ATF_REQUIRE_EQ_MSG(pthread_cond_timedwait(&static_cond, &static_mutex, &ts), ETIMEDOUT, "pthread_cond_timedwait() (unthreaded) in the " "past"); printf("unthreaded test (zero time)\n"); tv.tv_sec = 0; tv.tv_usec = 0; TIMEVAL_TO_TIMESPEC(&tv, &ts); ATF_REQUIRE_EQ_MSG(pthread_cond_timedwait(&static_cond, &static_mutex, &ts), ETIMEDOUT, "pthread_cond_timedwait() (unthreaded) with zero " "time"); PTHREAD_REQUIRE(pthread_create(&new, NULL, bogus_timedwaits_threadfunc, NULL)); PTHREAD_REQUIRE(pthread_join(new, NULL)); printf("threaded test\n"); gettimeofday(&tv, NULL); tv.tv_sec -= 2; /* Place the time in the past */ TIMEVAL_TO_TIMESPEC(&tv, &ts); ATF_REQUIRE_EQ_MSG(pthread_cond_timedwait(&static_cond, &static_mutex, &ts), ETIMEDOUT, "pthread_cond_timedwait() (threaded) in the past"); printf("threaded test (zero time)\n"); tv.tv_sec = 0; tv.tv_usec = 0; TIMEVAL_TO_TIMESPEC(&tv, &ts); ATF_REQUIRE_EQ_MSG(pthread_cond_timedwait(&static_cond, &static_mutex, &ts), ETIMEDOUT, "pthread_cond_timedwait() (threaded) with zero " "time"); PTHREAD_REQUIRE(pthread_mutex_unlock(&static_mutex)); } +#ifdef __FreeBSD__ +static void * +destroy_busy_threadfunc(void *arg) +{ + PTHREAD_REQUIRE(pthread_mutex_lock(&mutex)); + + share = 1; + PTHREAD_REQUIRE(pthread_cond_broadcast(&cond)); + PTHREAD_REQUIRE(pthread_cond_wait(&cond, &mutex)); + + PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex)); + + return NULL; +} + +ATF_TC(destroy_busy); +ATF_TC_HEAD(destroy_busy, tc) +{ + atf_tc_set_md_var(tc, "descr", "Checks non-standard behaviour of " + "returning EBUSY when attempting to destroy an active condvar"); +} +ATF_TC_BODY(destroy_busy, tc) +{ + pthread_t thread; + + PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL)); + PTHREAD_REQUIRE(pthread_cond_init(&cond, NULL)); + PTHREAD_REQUIRE(pthread_mutex_lock(&mutex)); + PTHREAD_REQUIRE(pthread_create(&thread, NULL, destroy_busy_threadfunc, + NULL)); + + while (share == 0) { + PTHREAD_REQUIRE(pthread_cond_wait(&cond, &mutex)); + } + + PTHREAD_REQUIRE_STATUS(pthread_cond_destroy(&cond), EBUSY); + PTHREAD_REQUIRE(pthread_cond_signal(&cond)); + PTHREAD_REQUIRE(pthread_cond_destroy(&cond)); + + PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex)); + PTHREAD_REQUIRE(pthread_join(thread, NULL)); + PTHREAD_REQUIRE(pthread_mutex_destroy(&mutex)); +} +#endif + static void unlock(void *arg) { pthread_mutex_unlock((pthread_mutex_t *)arg); } static void * destroy_after_cancel_threadfunc(void *arg) { PTHREAD_REQUIRE(pthread_mutex_lock(&mutex)); pthread_cleanup_push(unlock, &mutex); while (1) { share = 1; PTHREAD_REQUIRE(pthread_cond_broadcast(&cond)); PTHREAD_REQUIRE(pthread_cond_wait(&cond, &mutex)); } pthread_cleanup_pop(0); PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex)); return NULL; } ATF_TC(destroy_after_cancel); ATF_TC_HEAD(destroy_after_cancel, tc) { atf_tc_set_md_var(tc, "descr", "Checks destroying a condition variable " "after cancelling a wait"); } ATF_TC_BODY(destroy_after_cancel, tc) { pthread_t thread; PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL)); PTHREAD_REQUIRE(pthread_cond_init(&cond, NULL)); PTHREAD_REQUIRE(pthread_mutex_lock(&mutex)); PTHREAD_REQUIRE(pthread_create(&thread, NULL, destroy_after_cancel_threadfunc, NULL)); while (share == 0) { PTHREAD_REQUIRE(pthread_cond_wait(&cond, &mutex)); } PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex)); PTHREAD_REQUIRE(pthread_cancel(thread)); PTHREAD_REQUIRE(pthread_join(thread, NULL)); PTHREAD_REQUIRE(pthread_cond_destroy(&cond)); PTHREAD_REQUIRE(pthread_mutex_destroy(&mutex)); } +static void * +destroy_after_signal_threadfunc(void *arg) +{ + PTHREAD_REQUIRE(pthread_mutex_lock(&mutex)); + + share = 1; + PTHREAD_REQUIRE(pthread_cond_broadcast(&cond)); + PTHREAD_REQUIRE(pthread_cond_wait(&cond, &mutex)); + + PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex)); + + return NULL; +} + +ATF_TC(destroy_after_signal); +ATF_TC_HEAD(destroy_after_signal, tc) +{ + atf_tc_set_md_var(tc, "descr", "Checks destroying a condition variable " + "immediately after signaling waiters"); +} +ATF_TC_BODY(destroy_after_signal, tc) +{ + pthread_t thread; + + PTHREAD_REQUIRE(pthread_mutex_init(&mutex, NULL)); + PTHREAD_REQUIRE(pthread_cond_init(&cond, NULL)); + PTHREAD_REQUIRE(pthread_mutex_lock(&mutex)); + PTHREAD_REQUIRE(pthread_create(&thread, NULL, + destroy_after_signal_threadfunc, NULL)); + + while (share == 0) { + PTHREAD_REQUIRE(pthread_cond_wait(&cond, &mutex)); + } + + PTHREAD_REQUIRE(pthread_cond_signal(&cond)); + PTHREAD_REQUIRE(pthread_cond_destroy(&cond)); + PTHREAD_REQUIRE(pthread_mutex_unlock(&mutex)); + + PTHREAD_REQUIRE(pthread_join(thread, NULL)); + + PTHREAD_REQUIRE(pthread_mutex_destroy(&mutex)); +} + ATF_TC(condattr); ATF_TC_HEAD(condattr, tc) { atf_tc_set_md_var(tc, "descr", "Checks Condattr"); } ATF_TC_BODY(condattr, tc) { pthread_condattr_t condattr; clockid_t clockid; PTHREAD_REQUIRE(pthread_condattr_init(&condattr)); PTHREAD_REQUIRE(pthread_condattr_setclock(&condattr, CLOCK_REALTIME)); PTHREAD_REQUIRE(pthread_condattr_getclock(&condattr, &clockid)); ATF_REQUIRE_EQ(clockid, CLOCK_REALTIME); PTHREAD_REQUIRE(pthread_condattr_setclock(&condattr, CLOCK_MONOTONIC)); PTHREAD_REQUIRE(pthread_condattr_getclock(&condattr, &clockid)); ATF_REQUIRE_EQ(clockid, CLOCK_MONOTONIC); } ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, signal_delay_wait); ATF_TP_ADD_TC(tp, signal_before_unlock); ATF_TP_ADD_TC(tp, signal_before_unlock_static_init); ATF_TP_ADD_TC(tp, signal_wait_race); ATF_TP_ADD_TC(tp, cond_timedwait_race); ATF_TP_ADD_TC(tp, broadcast); ATF_TP_ADD_TC(tp, bogus_timedwaits); +#ifdef __FreeBSD__ + ATF_TP_ADD_TC(tp, destroy_busy); +#endif ATF_TP_ADD_TC(tp, destroy_after_cancel); + ATF_TP_ADD_TC(tp, destroy_after_signal); ATF_TP_ADD_TC(tp, condattr); return atf_no_error(); } Index: stable/12/lib/libthr/thread/thr_cond.c =================================================================== --- stable/12/lib/libthr/thread/thr_cond.c (revision 345500) +++ stable/12/lib/libthr/thread/thr_cond.c (revision 345501) @@ -1,546 +1,555 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2005 David Xu * Copyright (c) 2015 The FreeBSD Foundation * All rights reserved. * * Portions of this software were developed by Konstantin Belousov * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice unmodified, this list of conditions, and the following * disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include "namespace.h" #include #include #include #include #include #include "un-namespace.h" #include "thr_private.h" _Static_assert(sizeof(struct pthread_cond) <= PAGE_SIZE, "pthread_cond too large"); /* * Prototypes */ int __pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex); int __pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec * abstime); static int cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr); static int cond_wait_common(pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime, int cancel); static int cond_signal_common(pthread_cond_t *cond); static int cond_broadcast_common(pthread_cond_t *cond); /* * Double underscore versions are cancellation points. Single underscore * versions are not and are provided for libc internal usage (which * shouldn't introduce cancellation points). */ __weak_reference(__pthread_cond_wait, pthread_cond_wait); __weak_reference(__pthread_cond_timedwait, pthread_cond_timedwait); __weak_reference(_pthread_cond_init, pthread_cond_init); __weak_reference(_pthread_cond_destroy, pthread_cond_destroy); __weak_reference(_pthread_cond_signal, pthread_cond_signal); __weak_reference(_pthread_cond_broadcast, pthread_cond_broadcast); #define CV_PSHARED(cvp) (((cvp)->kcond.c_flags & USYNC_PROCESS_SHARED) != 0) static void cond_init_body(struct pthread_cond *cvp, const struct pthread_cond_attr *cattr) { if (cattr == NULL) { cvp->kcond.c_clockid = CLOCK_REALTIME; } else { if (cattr->c_pshared) cvp->kcond.c_flags |= USYNC_PROCESS_SHARED; cvp->kcond.c_clockid = cattr->c_clockid; } } static int cond_init(pthread_cond_t *cond, const pthread_condattr_t *cond_attr) { struct pthread_cond *cvp; const struct pthread_cond_attr *cattr; int pshared; cattr = cond_attr != NULL ? *cond_attr : NULL; if (cattr == NULL || cattr->c_pshared == PTHREAD_PROCESS_PRIVATE) { pshared = 0; cvp = calloc(1, sizeof(struct pthread_cond)); if (cvp == NULL) return (ENOMEM); } else { pshared = 1; cvp = __thr_pshared_offpage(cond, 1); if (cvp == NULL) return (EFAULT); } /* * Initialise the condition variable structure: */ cond_init_body(cvp, cattr); *cond = pshared ? THR_PSHARED_PTR : cvp; return (0); } static int init_static(struct pthread *thread, pthread_cond_t *cond) { int ret; THR_LOCK_ACQUIRE(thread, &_cond_static_lock); if (*cond == NULL) ret = cond_init(cond, NULL); else ret = 0; THR_LOCK_RELEASE(thread, &_cond_static_lock); return (ret); } #define CHECK_AND_INIT_COND \ if (*cond == THR_PSHARED_PTR) { \ cvp = __thr_pshared_offpage(cond, 0); \ if (cvp == NULL) \ return (EINVAL); \ } else if (__predict_false((cvp = (*cond)) <= THR_COND_DESTROYED)) { \ if (cvp == THR_COND_INITIALIZER) { \ int ret; \ ret = init_static(_get_curthread(), cond); \ if (ret) \ return (ret); \ } else if (cvp == THR_COND_DESTROYED) { \ return (EINVAL); \ } \ cvp = *cond; \ } int _pthread_cond_init(pthread_cond_t * __restrict cond, const pthread_condattr_t * __restrict cond_attr) { *cond = NULL; return (cond_init(cond, cond_attr)); } int _pthread_cond_destroy(pthread_cond_t *cond) { struct pthread_cond *cvp; int error; error = 0; if (*cond == THR_PSHARED_PTR) { cvp = __thr_pshared_offpage(cond, 0); - if (cvp != NULL) - __thr_pshared_destroy(cond); - *cond = THR_COND_DESTROYED; + if (cvp != NULL) { + if (cvp->kcond.c_has_waiters) + error = EBUSY; + else + __thr_pshared_destroy(cond); + } + if (error == 0) + *cond = THR_COND_DESTROYED; } else if ((cvp = *cond) == THR_COND_INITIALIZER) { /* nothing */ } else if (cvp == THR_COND_DESTROYED) { error = EINVAL; } else { cvp = *cond; - *cond = THR_COND_DESTROYED; - free(cvp); + if (cvp->__has_user_waiters || cvp->kcond.c_has_waiters) + error = EBUSY; + else { + *cond = THR_COND_DESTROYED; + free(cvp); + } } return (error); } /* * Cancellation behavior: * Thread may be canceled at start, if thread is canceled, it means it * did not get a wakeup from pthread_cond_signal(), otherwise, it is * not canceled. * Thread cancellation never cause wakeup from pthread_cond_signal() * to be lost. */ static int cond_wait_kernel(struct pthread_cond *cvp, struct pthread_mutex *mp, const struct timespec *abstime, int cancel) { struct pthread *curthread; int error, error2, recurse, robust; curthread = _get_curthread(); robust = _mutex_enter_robust(curthread, mp); error = _mutex_cv_detach(mp, &recurse); if (error != 0) { if (robust) _mutex_leave_robust(curthread, mp); return (error); } if (cancel) _thr_cancel_enter2(curthread, 0); error = _thr_ucond_wait(&cvp->kcond, &mp->m_lock, abstime, CVWAIT_ABSTIME | CVWAIT_CLOCKID); if (cancel) _thr_cancel_leave(curthread, 0); /* * Note that PP mutex and ROBUST mutex may return * interesting error codes. */ if (error == 0) { error2 = _mutex_cv_lock(mp, recurse, true); } else if (error == EINTR || error == ETIMEDOUT) { error2 = _mutex_cv_lock(mp, recurse, true); /* * Do not do cancellation on EOWNERDEAD there. The * cancellation cleanup handler will use the protected * state and unlock the mutex without making the state * consistent and the state will be unrecoverable. */ if (error2 == 0 && cancel) { if (robust) { _mutex_leave_robust(curthread, mp); robust = false; } _thr_testcancel(curthread); } if (error == EINTR) error = 0; } else { /* We know that it didn't unlock the mutex. */ _mutex_cv_attach(mp, recurse); if (cancel) { if (robust) { _mutex_leave_robust(curthread, mp); robust = false; } _thr_testcancel(curthread); } error2 = 0; } if (robust) _mutex_leave_robust(curthread, mp); return (error2 != 0 ? error2 : error); } /* * Thread waits in userland queue whenever possible, when thread * is signaled or broadcasted, it is removed from the queue, and * is saved in curthread's defer_waiters[] buffer, but won't be * woken up until mutex is unlocked. */ static int cond_wait_user(struct pthread_cond *cvp, struct pthread_mutex *mp, const struct timespec *abstime, int cancel) { struct pthread *curthread; struct sleepqueue *sq; int deferred, error, error2, recurse; curthread = _get_curthread(); if (curthread->wchan != NULL) PANIC("thread %p was already on queue.", curthread); if (cancel) _thr_testcancel(curthread); _sleepq_lock(cvp); /* * set __has_user_waiters before unlocking mutex, this allows * us to check it without locking in pthread_cond_signal(). */ cvp->__has_user_waiters = 1; deferred = 0; (void)_mutex_cv_unlock(mp, &recurse, &deferred); curthread->mutex_obj = mp; _sleepq_add(cvp, curthread); for(;;) { _thr_clear_wake(curthread); _sleepq_unlock(cvp); if (deferred) { deferred = 0; if ((mp->m_lock.m_owner & UMUTEX_CONTESTED) == 0) (void)_umtx_op_err(&mp->m_lock, UMTX_OP_MUTEX_WAKE2, mp->m_lock.m_flags, 0, 0); } if (curthread->nwaiter_defer > 0) { _thr_wake_all(curthread->defer_waiters, curthread->nwaiter_defer); curthread->nwaiter_defer = 0; } if (cancel) _thr_cancel_enter2(curthread, 0); error = _thr_sleep(curthread, cvp->kcond.c_clockid, abstime); if (cancel) _thr_cancel_leave(curthread, 0); _sleepq_lock(cvp); if (curthread->wchan == NULL) { error = 0; break; } else if (cancel && SHOULD_CANCEL(curthread)) { sq = _sleepq_lookup(cvp); cvp->__has_user_waiters = _sleepq_remove(sq, curthread); _sleepq_unlock(cvp); curthread->mutex_obj = NULL; error2 = _mutex_cv_lock(mp, recurse, false); if (!THR_IN_CRITICAL(curthread)) _pthread_exit(PTHREAD_CANCELED); else /* this should not happen */ return (error2); } else if (error == ETIMEDOUT) { sq = _sleepq_lookup(cvp); cvp->__has_user_waiters = _sleepq_remove(sq, curthread); break; } } _sleepq_unlock(cvp); curthread->mutex_obj = NULL; error2 = _mutex_cv_lock(mp, recurse, false); if (error == 0) error = error2; return (error); } static int cond_wait_common(pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime, int cancel) { struct pthread *curthread = _get_curthread(); struct pthread_cond *cvp; struct pthread_mutex *mp; int error; CHECK_AND_INIT_COND if (*mutex == THR_PSHARED_PTR) { mp = __thr_pshared_offpage(mutex, 0); if (mp == NULL) return (EINVAL); } else { mp = *mutex; } if ((error = _mutex_owned(curthread, mp)) != 0) return (error); if (curthread->attr.sched_policy != SCHED_OTHER || (mp->m_lock.m_flags & (UMUTEX_PRIO_PROTECT | UMUTEX_PRIO_INHERIT | USYNC_PROCESS_SHARED)) != 0 || CV_PSHARED(cvp)) return (cond_wait_kernel(cvp, mp, abstime, cancel)); else return (cond_wait_user(cvp, mp, abstime, cancel)); } int _pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) { return (cond_wait_common(cond, mutex, NULL, 0)); } int __pthread_cond_wait(pthread_cond_t * __restrict cond, pthread_mutex_t * __restrict mutex) { return (cond_wait_common(cond, mutex, NULL, 1)); } int _pthread_cond_timedwait(pthread_cond_t * __restrict cond, pthread_mutex_t * __restrict mutex, const struct timespec * __restrict abstime) { if (abstime == NULL || abstime->tv_sec < 0 || abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) return (EINVAL); return (cond_wait_common(cond, mutex, abstime, 0)); } int __pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime) { if (abstime == NULL || abstime->tv_sec < 0 || abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000) return (EINVAL); return (cond_wait_common(cond, mutex, abstime, 1)); } static int cond_signal_common(pthread_cond_t *cond) { struct pthread *curthread = _get_curthread(); struct pthread *td; struct pthread_cond *cvp; struct pthread_mutex *mp; struct sleepqueue *sq; int *waddr; int pshared; /* * If the condition variable is statically initialized, perform dynamic * initialization. */ CHECK_AND_INIT_COND pshared = CV_PSHARED(cvp); _thr_ucond_signal(&cvp->kcond); if (pshared || cvp->__has_user_waiters == 0) return (0); curthread = _get_curthread(); waddr = NULL; _sleepq_lock(cvp); sq = _sleepq_lookup(cvp); if (sq == NULL) { _sleepq_unlock(cvp); return (0); } td = _sleepq_first(sq); mp = td->mutex_obj; cvp->__has_user_waiters = _sleepq_remove(sq, td); if (PMUTEX_OWNER_ID(mp) == TID(curthread)) { if (curthread->nwaiter_defer >= MAX_DEFER_WAITERS) { _thr_wake_all(curthread->defer_waiters, curthread->nwaiter_defer); curthread->nwaiter_defer = 0; } curthread->defer_waiters[curthread->nwaiter_defer++] = &td->wake_addr->value; mp->m_flags |= PMUTEX_FLAG_DEFERRED; } else { waddr = &td->wake_addr->value; } _sleepq_unlock(cvp); if (waddr != NULL) _thr_set_wake(waddr); return (0); } struct broadcast_arg { struct pthread *curthread; unsigned int *waddrs[MAX_DEFER_WAITERS]; int count; }; static void drop_cb(struct pthread *td, void *arg) { struct broadcast_arg *ba = arg; struct pthread_mutex *mp; struct pthread *curthread = ba->curthread; mp = td->mutex_obj; if (PMUTEX_OWNER_ID(mp) == TID(curthread)) { if (curthread->nwaiter_defer >= MAX_DEFER_WAITERS) { _thr_wake_all(curthread->defer_waiters, curthread->nwaiter_defer); curthread->nwaiter_defer = 0; } curthread->defer_waiters[curthread->nwaiter_defer++] = &td->wake_addr->value; mp->m_flags |= PMUTEX_FLAG_DEFERRED; } else { if (ba->count >= MAX_DEFER_WAITERS) { _thr_wake_all(ba->waddrs, ba->count); ba->count = 0; } ba->waddrs[ba->count++] = &td->wake_addr->value; } } static int cond_broadcast_common(pthread_cond_t *cond) { int pshared; struct pthread_cond *cvp; struct sleepqueue *sq; struct broadcast_arg ba; /* * If the condition variable is statically initialized, perform dynamic * initialization. */ CHECK_AND_INIT_COND pshared = CV_PSHARED(cvp); _thr_ucond_broadcast(&cvp->kcond); if (pshared || cvp->__has_user_waiters == 0) return (0); ba.curthread = _get_curthread(); ba.count = 0; _sleepq_lock(cvp); sq = _sleepq_lookup(cvp); if (sq == NULL) { _sleepq_unlock(cvp); return (0); } _sleepq_drop(sq, drop_cb, &ba); cvp->__has_user_waiters = 0; _sleepq_unlock(cvp); if (ba.count > 0) _thr_wake_all(ba.waddrs, ba.count); return (0); } int _pthread_cond_signal(pthread_cond_t * cond) { return (cond_signal_common(cond)); } int _pthread_cond_broadcast(pthread_cond_t * cond) { return (cond_broadcast_common(cond)); } Index: stable/12 =================================================================== --- stable/12 (revision 345500) +++ stable/12 (revision 345501) Property changes on: stable/12 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r344935