diff options
| author | Torvald Riegel <triegel@redhat.com> | 2014-11-25 19:48:56 +0100 |
|---|---|---|
| committer | Torvald Riegel <triegel@redhat.com> | 2014-11-26 10:07:20 +0100 |
| commit | cdcb42d7f786fe5ee1ca60065924d0b5c6649dd0 (patch) | |
| tree | 302e5e92ddcc5996250b9d5ee3ab578afaa128ef /nptl/pthread_mutex_init.c | |
| parent | c82f5c0ce5c1c0180fca311ceb29fd2d59da7441 (diff) | |
| download | glibc-cdcb42d7f786fe5ee1ca60065924d0b5c6649dd0.tar.gz glibc-cdcb42d7f786fe5ee1ca60065924d0b5c6649dd0.tar.xz glibc-cdcb42d7f786fe5ee1ca60065924d0b5c6649dd0.zip | |
Fix synchronization of TPP min/max priorities.
* nptl/tpp.c (__init_sched_fifo_prio, __pthread_tpp_change_priority): Change synchronization of __sched_fifo_min_prio and __sched_fifo_max_prio. * nptl/pthread_mutexattr_getprioceiling.c (pthread_mutexattr_getprioceiling): Likewise. * nptl/pthread_mutexattr_setprioceiling.c (pthread_mutexattr_setprioceiling): Likewise. * nptl/pthread_mutex_init.c (__pthread_mutex_init): Likewise. * nptl/pthread_mutex_setprioceiling.c (pthread_mutex_setprioceiling): Likewise.
Diffstat (limited to 'nptl/pthread_mutex_init.c')
| -rw-r--r-- | nptl/pthread_mutex_init.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nptl/pthread_mutex_init.c b/nptl/pthread_mutex_init.c index 9f28b8d8dc..38597ab0f8 100644 --- a/nptl/pthread_mutex_init.c +++ b/nptl/pthread_mutex_init.c @@ -22,6 +22,7 @@ #include <string.h> #include <kernel-features.h> #include "pthreadP.h" +#include <atomic.h> #include <stap-probe.h> @@ -117,10 +118,11 @@ __pthread_mutex_init (mutex, mutexattr) >> PTHREAD_MUTEXATTR_PRIO_CEILING_SHIFT; if (! ceiling) { - if (__sched_fifo_min_prio == -1) + /* See __init_sched_fifo_prio. */ + if (atomic_load_relaxed (&__sched_fifo_min_prio) == -1) __init_sched_fifo_prio (); - if (ceiling < __sched_fifo_min_prio) - ceiling = __sched_fifo_min_prio; + if (ceiling < atomic_load_relaxed (&__sched_fifo_min_prio)) + ceiling = atomic_load_relaxed (&__sched_fifo_min_prio); } mutex->__data.__lock = ceiling << PTHREAD_MUTEX_PRIO_CEILING_SHIFT; break; |