about summary refs log tree commit diff
path: root/nptl/pthread_cond_signal.c
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2013-10-01 20:35:28 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2013-10-01 20:35:28 +0530
commitad4e70da03353444aad95a4fbbd03cef2b750647 (patch)
treeb7fd16e0cdb2f30deb7e3cb37c02d13fb39f9f83 /nptl/pthread_cond_signal.c
parentfd96752258901457148b702093a34a3d8c0fb7db (diff)
downloadglibc-ad4e70da03353444aad95a4fbbd03cef2b750647.tar.gz
glibc-ad4e70da03353444aad95a4fbbd03cef2b750647.tar.xz
glibc-ad4e70da03353444aad95a4fbbd03cef2b750647.zip
Fix PI mutex check in pthread_cond_broadcast and pthread_cond_signal
Fixes BZ #15988.

The check had a typo - it checked for PTHREAD_MUTEX_ROBUST_NP instead
of PTHREAD_MUTEX_ROBUST_NORMAL_NP.  It has now been replaced by the
already existing convenience macro USE_REQUEUE_PI.
Diffstat (limited to 'nptl/pthread_cond_signal.c')
-rw-r--r--nptl/pthread_cond_signal.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c
index 102d0b380c..ffc35dc9e1 100644
--- a/nptl/pthread_cond_signal.c
+++ b/nptl/pthread_cond_signal.c
@@ -49,14 +49,9 @@ __pthread_cond_signal (cond)
 
 #if (defined lll_futex_cmp_requeue_pi \
      && defined __ASSUME_REQUEUE_PI)
-      int pi_flag = PTHREAD_MUTEX_PRIO_INHERIT_NP | PTHREAD_MUTEX_ROBUST_NP;
       pthread_mutex_t *mut = cond->__data.__mutex;
 
-      /* Do not use requeue for pshared condvars.  */
-      if (mut != (void *) ~0l)
-	pi_flag &= mut->__data.__kind;
-
-      if (__builtin_expect (pi_flag == PTHREAD_MUTEX_PRIO_INHERIT_NP, 0)
+      if (USE_REQUEUE_PI (mut)
 	/* This can only really fail with a ENOSYS, since nobody can modify
 	   futex while we have the cond_lock.  */
 	  && lll_futex_cmp_requeue_pi (&cond->__data.__futex, 1, 0,