diff options
Diffstat (limited to 'locks')
| -rw-r--r-- | locks/unix/proc_mutex.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c index 3df7df8b8..2bd695dfd 100644 --- a/locks/unix/proc_mutex.c +++ b/locks/unix/proc_mutex.c @@ -493,7 +493,7 @@ typedef struct { (proc_pthread_cast(m)->cond) apr_int32_t cond_locked; #define proc_pthread_mutex_cond_locked(m) \ - ((m)->pthread_refcounting ? proc_pthread_cast(m)->cond_locked : -1) + (proc_pthread_cast(m)->cond_locked) apr_uint32_t cond_num_waiters; #define proc_pthread_mutex_cond_num_waiters(m) \ (proc_pthread_cast(m)->cond_num_waiters) @@ -527,7 +527,8 @@ static apr_status_t proc_pthread_mutex_unref(void *mutex_) apr_status_t rv; #if APR_USE_PROC_PTHREAD_MUTEX_COND - if (proc_pthread_mutex_cond_locked(mutex) != -1) { + if (mutex->pthread_refcounting && + proc_pthread_mutex_cond_locked(mutex) != -1) { mutex->curr_locked = 0; } else @@ -542,7 +543,8 @@ static apr_status_t proc_pthread_mutex_unref(void *mutex_) } if (!proc_pthread_mutex_dec(mutex)) { #if APR_USE_PROC_PTHREAD_MUTEX_COND - if (proc_pthread_mutex_cond_locked(mutex) != -1 && + if (mutex->pthread_refcounting && + proc_pthread_mutex_cond_locked(mutex) != -1 && (rv = pthread_cond_destroy(&proc_pthread_mutex_cond(mutex)))) { #ifdef HAVE_ZOS_PTHREADS rv = errno; @@ -691,7 +693,8 @@ static apr_status_t proc_mutex_pthread_acquire_ex(apr_proc_mutex_t *mutex, apr_status_t rv; #if APR_USE_PROC_PTHREAD_MUTEX_COND - if (proc_pthread_mutex_cond_locked(mutex) != -1) { + if (mutex->pthread_refcounting && + proc_pthread_mutex_cond_locked(mutex) != -1) { if ((rv = pthread_mutex_lock(&proc_pthread_mutex(mutex)))) { #ifdef HAVE_ZOS_PTHREADS rv = errno; @@ -837,7 +840,8 @@ static apr_status_t proc_mutex_pthread_release(apr_proc_mutex_t *mutex) apr_status_t rv; #if APR_USE_PROC_PTHREAD_MUTEX_COND - if (proc_pthread_mutex_cond_locked(mutex) != -1) { + if (mutex->pthread_refcounting && + proc_pthread_mutex_cond_locked(mutex) != -1) { if ((rv = pthread_mutex_lock(&proc_pthread_mutex(mutex)))) { #ifdef HAVE_ZOS_PTHREADS rv = errno; |