diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-08-30 19:11:05 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-08-30 19:11:05 +0000 |
| commit | bee2df0bb966087d7f57d935a4234ffe30c76196 (patch) | |
| tree | 045458320a987e129ff0770f957de833bd43f4d5 /nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c | |
| parent | 99ea5991a4957f7a21466a4b48c5020eb70db2b7 (diff) | |
* pthread_rwlock_trywrlock.c (__pthread_rwlock_trywrlock): Respectcvs/fedora-glibc-20060831T0640
reader preference.
* sysdeps/pthread/pthread_rwlock_timedwrlock.c
(pthread_rwlock_timedwrlock): Likewise.
* sysdeps/pthread/pthread_rwlock_wrlock.c (__pthread_rwlock_wrlock):
Likewise.
Diffstat (limited to 'nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c')
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c | 6 |
1 files changed, 4 insertions, 2 deletions
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); |