yann@3242
|
1 |
commit 2770d15e7e880821fc586619c59eb45180628e16
|
yann@3242
|
2 |
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
|
yann@3242
|
3 |
Date: Thu Oct 3 08:26:21 2013 +0530
|
yann@3242
|
4 |
|
yann@3242
|
5 |
Fix PI mutex check in pthread_cond_broadcast and pthread_cond_signal
|
yann@3242
|
6 |
|
yann@3242
|
7 |
Fixes BZ #15996.
|
yann@3242
|
8 |
|
yann@3242
|
9 |
The check had a typo - it checked for PTHREAD_MUTEX_ROBUST_NP instead
|
yann@3242
|
10 |
of PTHREAD_MUTEX_ROBUST_NORMAL_NP. It has now been replaced by the
|
yann@3242
|
11 |
already existing convenience macro USE_REQUEUE_PI.
|
yann@3242
|
12 |
|
yann@3242
|
13 |
diff --git a/NEWS b/NEWS
|
yann@3242
|
14 |
index f64fb82..fb6069d 100644
|
yann@3242
|
15 |
--- a/NEWS
|
yann@3242
|
16 |
+++ b/NEWS
|
yann@3242
|
17 |
@@ -9,7 +9,7 @@ Version 2.18.1
|
yann@3242
|
18 |
|
yann@3242
|
19 |
* The following bugs are resolved with this release:
|
yann@3242
|
20 |
|
yann@3242
|
21 |
- 15909.
|
yann@3242
|
22 |
+ 15909, 15996.
|
yann@3242
|
23 |
|
yann@3242
|
24 |
Version 2.18
|
yann@3242
|
25 |
|
yann@3242
|
26 |
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
|
yann@3242
|
27 |
index eae5079..2d78490 100644
|
yann@3242
|
28 |
--- a/nptl/ChangeLog
|
yann@3242
|
29 |
+++ b/nptl/ChangeLog
|
yann@3242
|
30 |
@@ -1,3 +1,12 @@
|
yann@3242
|
31 |
+2013-10-03 Siddhesh Poyarekar <siddhesh@redhat.com>
|
yann@3242
|
32 |
+
|
yann@3242
|
33 |
+ [BZ #15996]
|
yann@3242
|
34 |
+ * pthread_cond_broadcast.c (__pthread_cond_broadcast)
|
yann@3242
|
35 |
+ [lll_futex_cmp_requeue_pi && __ASSUME_REQUEUE_PI]: Use
|
yann@3242
|
36 |
+ USE_REQUEUE_PI.
|
yann@3242
|
37 |
+ * pthread_cond_signal.c (__pthread_cond_signal)
|
yann@3242
|
38 |
+ [lll_futex_cmd_requeue_pi && __ASSUME_REQUEUE_PI]: Likewise.
|
yann@3242
|
39 |
+
|
yann@3242
|
40 |
2013-07-23 David S. Miller <davem@davemloft.net>
|
yann@3242
|
41 |
|
yann@3242
|
42 |
* tst-cancel4.c (WRITE_BUFFER_SIZE): Adjust comment.
|
yann@3242
|
43 |
diff --git a/nptl/pthread_cond_broadcast.c b/nptl/pthread_cond_broadcast.c
|
yann@3242
|
44 |
index 0702ec0..7ba9efa 100644
|
yann@3242
|
45 |
--- a/nptl/pthread_cond_broadcast.c
|
yann@3242
|
46 |
+++ b/nptl/pthread_cond_broadcast.c
|
yann@3242
|
47 |
@@ -63,10 +63,7 @@ __pthread_cond_broadcast (cond)
|
yann@3242
|
48 |
|
yann@3242
|
49 |
#if (defined lll_futex_cmp_requeue_pi \
|
yann@3242
|
50 |
&& defined __ASSUME_REQUEUE_PI)
|
yann@3242
|
51 |
- int pi_flag = PTHREAD_MUTEX_PRIO_INHERIT_NP | PTHREAD_MUTEX_ROBUST_NP;
|
yann@3242
|
52 |
- pi_flag &= mut->__data.__kind;
|
yann@3242
|
53 |
-
|
yann@3242
|
54 |
- if (pi_flag == PTHREAD_MUTEX_PRIO_INHERIT_NP)
|
yann@3242
|
55 |
+ if (USE_REQUEUE_PI (mut))
|
yann@3242
|
56 |
{
|
yann@3242
|
57 |
if (lll_futex_cmp_requeue_pi (&cond->__data.__futex, 1, INT_MAX,
|
yann@3242
|
58 |
&mut->__data.__lock, futex_val,
|
yann@3242
|
59 |
diff --git a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c
|
yann@3242
|
60 |
index 102d0b3..ffc35dc 100644
|
yann@3242
|
61 |
--- a/nptl/pthread_cond_signal.c
|
yann@3242
|
62 |
+++ b/nptl/pthread_cond_signal.c
|
yann@3242
|
63 |
@@ -49,14 +49,9 @@ __pthread_cond_signal (cond)
|
yann@3242
|
64 |
|
yann@3242
|
65 |
#if (defined lll_futex_cmp_requeue_pi \
|
yann@3242
|
66 |
&& defined __ASSUME_REQUEUE_PI)
|
yann@3242
|
67 |
- int pi_flag = PTHREAD_MUTEX_PRIO_INHERIT_NP | PTHREAD_MUTEX_ROBUST_NP;
|
yann@3242
|
68 |
pthread_mutex_t *mut = cond->__data.__mutex;
|
yann@3242
|
69 |
|
yann@3242
|
70 |
- /* Do not use requeue for pshared condvars. */
|
yann@3242
|
71 |
- if (mut != (void *) ~0l)
|
yann@3242
|
72 |
- pi_flag &= mut->__data.__kind;
|
yann@3242
|
73 |
-
|
yann@3242
|
74 |
- if (__builtin_expect (pi_flag == PTHREAD_MUTEX_PRIO_INHERIT_NP, 0)
|
yann@3242
|
75 |
+ if (USE_REQUEUE_PI (mut)
|
yann@3242
|
76 |
/* This can only really fail with a ENOSYS, since nobody can modify
|
yann@3242
|
77 |
futex while we have the cond_lock. */
|
yann@3242
|
78 |
&& lll_futex_cmp_requeue_pi (&cond->__data.__futex, 1, 0,
|