aboutsummaryrefslogtreecommitdiff
path: root/linuxthreads/rwlock.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-01-17 04:00:04 +0000
committerUlrich Drepper <drepper@redhat.com>2000-01-17 04:00:04 +0000
commit2449110a8ae9b7fb65259560a96b6fafd14e791f (patch)
tree94f74bb950c566fa4438d23bd60f27c59a6d730b /linuxthreads/rwlock.c
parent01ff9d0b5496c8bc5c7c1295485c05d52bbdfa9c (diff)
downloadglibc-2449110a8ae9b7fb65259560a96b6fafd14e791f.tar
glibc-2449110a8ae9b7fb65259560a96b6fafd14e791f.tar.gz
glibc-2449110a8ae9b7fb65259560a96b6fafd14e791f.tar.bz2
glibc-2449110a8ae9b7fb65259560a96b6fafd14e791f.zip
Update.
* Makeconfig (rpath-dirs): Remove db2. (dbojdir): Remove variable.
Diffstat (limited to 'linuxthreads/rwlock.c')
-rw-r--r--linuxthreads/rwlock.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/linuxthreads/rwlock.c b/linuxthreads/rwlock.c
index 7b472e284c..e1401c3c0c 100644
--- a/linuxthreads/rwlock.c
+++ b/linuxthreads/rwlock.c
@@ -362,8 +362,9 @@ pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
}
rwlock->__rw_writer = NULL;
- if (rwlock->__rw_kind == PTHREAD_RWLOCK_PREFER_READER_NP
- || (th = dequeue (&rwlock->__rw_write_waiting)) == NULL)
+ if ((rwlock->__rw_kind == PTHREAD_RWLOCK_PREFER_READER_NP
+ && !queue_is_empty(&rwlock->__rw_read_waiting))
+ || (th = dequeue(&rwlock->__rw_write_waiting)) == NULL)
{
/* Restart all waiting readers. */
torestart = rwlock->__rw_read_waiting;
@@ -477,6 +478,7 @@ pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *attr, int pref)
{
if (pref != PTHREAD_RWLOCK_PREFER_READER_NP
&& pref != PTHREAD_RWLOCK_PREFER_WRITER_NP
+ && pref != PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP
&& pref != PTHREAD_RWLOCK_DEFAULT_NP)
return EINVAL;