From fcd61d91418fa19a4ad71973263f55edb33201d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Mon, 4 Feb 2008 12:35:23 +0000 Subject: [PATCH] After careful consideration (and a brief discussion with attilio@), change the semantics of pthread_mutex_islocked_np() to return true if and only if the mutex is held by the current thread. Obviously, change the regression test to match. MFC after: 2 weeks --- lib/libthr/thread/thr_mutex.c | 2 +- .../regression/pthread/mutex_islocked_np/mutex_islocked_np.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index 032f2e34371..9b6c21b03de 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -877,5 +877,5 @@ _pthread_mutex_islocked_np(pthread_mutex_t *mutex) if (__predict_false(ret)) return (ret); } - return ((*mutex)->m_qe.tqe_prev != NULL); + return ((*mutex)->m_lock.m_owner == TID(curthread)); } diff --git a/tools/regression/pthread/mutex_islocked_np/mutex_islocked_np.c b/tools/regression/pthread/mutex_islocked_np/mutex_islocked_np.c index 3e467a11feb..5ab7e330cab 100644 --- a/tools/regression/pthread/mutex_islocked_np/mutex_islocked_np.c +++ b/tools/regression/pthread/mutex_islocked_np/mutex_islocked_np.c @@ -37,8 +37,8 @@ thread(void *arg) { pthread_mutex_t *mtx = arg; - if (pthread_mutex_islocked_np(mtx) == 0) { - printf("pthread_mutex_islocked_np() returned zero\n" + if (pthread_mutex_islocked_np(mtx) != 0) { + printf("pthread_mutex_islocked_np() returned non-zero\n" "for a mutex held by another thread\n"); exit(1); }