diff options
Diffstat (limited to 'nptl/pthread_cond_destroy.c')
| -rw-r--r-- | nptl/pthread_cond_destroy.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/nptl/pthread_cond_destroy.c b/nptl/pthread_cond_destroy.c index 8574b6118f..3e4ec8d0e4 100644 --- a/nptl/pthread_cond_destroy.c +++ b/nptl/pthread_cond_destroy.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -45,7 +45,7 @@ __pthread_cond_destroy (cond) pthread_cond_destroy needs to wait for them. */ unsigned int nwaiters = cond->__data.__nwaiters; - if (nwaiters >= (1 << COND_NWAITERS_SHIFT)) + if (nwaiters >= (1 << COND_CLOCK_BITS)) { /* Wake everybody on the associated mutex in case there are threads that have been requeued to it. @@ -59,24 +59,20 @@ __pthread_cond_destroy (cond) && cond->__data.__mutex != (void *) ~0l) { pthread_mutex_t *mut = (pthread_mutex_t *) cond->__data.__mutex; - lll_futex_wake (&mut->__data.__lock, INT_MAX, - // XYZ check mutex flag - LLL_SHARED); + lll_futex_wake (&mut->__data.__lock, INT_MAX); } do { lll_mutex_unlock (cond->__data.__lock); - lll_futex_wait (&cond->__data.__nwaiters, nwaiters, - // XYZ check mutex flag - LLL_SHARED); + lll_futex_wait (&cond->__data.__nwaiters, nwaiters); lll_mutex_lock (cond->__data.__lock); nwaiters = cond->__data.__nwaiters; } - while (nwaiters >= (1 << COND_NWAITERS_SHIFT)); + while (nwaiters >= (1 << COND_CLOCK_BITS)); } return 0; |