From 13a836048c08f552187f2172cb362fb98f42c965 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 16 Mar 2000 21:43:22 +0000 Subject: Update. 2000-03-16 Ulrich Drepper * condvar.c: Make tests for ownership of mutex less strict. --- linuxthreads/ChangeLog | 4 ++++ linuxthreads/condvar.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index d600f27c39..bb3155347a 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,7 @@ +2000-03-16 Ulrich Drepper + + * condvar.c: Make tests for ownership of mutex less strict. + 2000-03-14 Ulrich Drepper * condvar.c (pthread_cond_wait): Check whether mutex is owned by diff --git a/linuxthreads/condvar.c b/linuxthreads/condvar.c index 023e5c6884..1c1b736f40 100644 --- a/linuxthreads/condvar.c +++ b/linuxthreads/condvar.c @@ -78,7 +78,7 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) int already_canceled = 0; /* Check whether the mutex is locked and owned by this thread. */ - if (mutex->__m_owner != self) + if (mutex->__m_kind != PTHREAD_MUTEX_FAST_NP && mutex->__m_owner != self) return EINVAL; /* Set up extrication interface */ @@ -144,7 +144,7 @@ pthread_cond_timedwait_relative_old(pthread_cond_t *cond, pthread_extricate_if extr; /* Check whether the mutex is locked and owned by this thread. */ - if (mutex->__m_owner != self) + if (mutex->__m_kind != PTHREAD_MUTEX_FAST_NP && mutex->__m_owner != self) return EINVAL; /* Set up extrication interface */ -- cgit 1.4.1