From 2449110a8ae9b7fb65259560a96b6fafd14e791f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 17 Jan 2000 04:00:04 +0000 Subject: Update. * Makeconfig (rpath-dirs): Remove db2. (dbojdir): Remove variable. --- linuxthreads/ChangeLog | 8 ++++++++ linuxthreads/rwlock.c | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'linuxthreads') diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index c783b3bf0a..754534e38e 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,11 @@ +2000-01-16 Ulrich Drepper + + * rwlock.c (pthread_rwlock_unlock): Correct one more problem with + preference handling. + (pthread_rwlockattr_setkind_np): Allow + PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP. + Patches by Kaz Kylheku . + 2000-01-12 Ulrich Drepper * internals.h (pthread_readlock_info): New structure. 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; -- cgit v1.2.3