diff options
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 9 | ||||
| -rw-r--r-- | nptl/pthread_rwlock_trywrlock.c | 7 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_rwlock_wrlock.c | 6 |
4 files changed, 22 insertions, 6 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index e84d149d77..f9e89997b1 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,12 @@ +2006-08-30 Ulrich Drepper <drepper@redhat.com> + + * pthread_rwlock_trywrlock.c (__pthread_rwlock_trywrlock): Respect + reader preference. + * sysdeps/pthread/pthread_rwlock_timedwrlock.c + (pthread_rwlock_timedwrlock): Likewise. + * sysdeps/pthread/pthread_rwlock_wrlock.c (__pthread_rwlock_wrlock): + Likewise. + 2006-08-25 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/libc_pthread_init.c (freeres_libpthread): diff --git a/nptl/pthread_rwlock_trywrlock.c b/nptl/pthread_rwlock_trywrlock.c index b754a19565..63760064c5 100644 --- a/nptl/pthread_rwlock_trywrlock.c +++ b/nptl/pthread_rwlock_trywrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -30,7 +30,10 @@ __pthread_rwlock_trywrlock (rwlock) lll_mutex_lock (rwlock->__data.__lock); - if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0) + if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0 + /* Respect the preference. */ + && (rwlock->__data.__flags != 0 + || rwlock->__data.__nr_readers_queued == 0)) { rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); result = 0; diff --git a/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c b/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c index 97c0598f96..ab7bc7babb 100644 --- a/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c +++ b/nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003. @@ -40,7 +40,9 @@ pthread_rwlock_timedwrlock (rwlock, abstime) int err; /* Get the rwlock if there is no writer and no reader. */ - if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0) + if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0 + && (rwlock->__data.__flags != 0 + || rwlock->__data.__nr_readers_queued == 0)) { /* Mark self as writer. */ rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); diff --git a/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c b/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c index 822aeed79c..4d967f2496 100644 --- a/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c +++ b/nptl/sysdeps/pthread/pthread_rwlock_wrlock.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2003 Free Software Foundation, Inc. +/* Copyright (C) 2003, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003. @@ -37,7 +37,9 @@ __pthread_rwlock_wrlock (rwlock) while (1) { /* Get the rwlock if there is no writer and no reader. */ - if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0) + if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0 + && (rwlock->__data.__flags != 0 + || rwlock->__data.__nr_readers_queued == 0)) { /* Mark self as writer. */ rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid); |