From 1cbdac2668c7f7a910145a40986030de83ca902a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Wed, 6 Feb 2008 19:34:31 +0000 Subject: [PATCH] Per discussion on -threads, rename _islocked_np() to _isowned_np(). --- include/pthread_np.h | 2 +- lib/libthr/pthread.map | 4 ++-- lib/libthr/thread/thr_mutex.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/pthread_np.h b/include/pthread_np.h index 06b2f5fc66c7..504c83bd0f21 100644 --- a/include/pthread_np.h +++ b/include/pthread_np.h @@ -53,7 +53,7 @@ int pthread_mutex_getspinloops_np(pthread_mutex_t *mutex, int *count); int pthread_mutex_setspinloops_np(pthread_mutex_t *mutex, int count); int pthread_mutex_getyieldloops_np(pthread_mutex_t *mutex, int *count); int pthread_mutex_setyieldloops_np(pthread_mutex_t *mutex, int count); -int pthread_mutex_islocked_np(pthread_mutex_t *mutex); +int pthread_mutex_isowned_np(pthread_mutex_t *mutex); int pthread_single_np(void); void pthread_suspend_all_np(void); int pthread_suspend_np(pthread_t); diff --git a/lib/libthr/pthread.map b/lib/libthr/pthread.map index dfd6c00590e4..6092ca6f0f64 100644 --- a/lib/libthr/pthread.map +++ b/lib/libthr/pthread.map @@ -398,14 +398,14 @@ local: FBSD_1.1 { global: - pthread_mutex_islocked_np; + pthread_mutex_isowned_np; local: *; } FBSD_1.0; FBSDprivate_1.1 { global: - _pthread_mutex_islocked_np; + _pthread_mutex_isowned_np; local: *; } FBSDprivate_1.0; diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index 9b6c21b03de4..abec1114b9a3 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -87,7 +87,7 @@ int __pthread_mutex_setspinloops_np(pthread_mutex_t *mutex, int count); int _pthread_mutex_setyieldloops_np(pthread_mutex_t *mutex, int count); int _pthread_mutex_getyieldloops_np(pthread_mutex_t *mutex, int *count); int __pthread_mutex_setyieldloops_np(pthread_mutex_t *mutex, int count); -int _pthread_mutex_islocked_np(pthread_mutex_t *mutex); +int _pthread_mutex_isowned_np(pthread_mutex_t *mutex); static int mutex_self_trylock(pthread_mutex_t); static int mutex_self_lock(pthread_mutex_t, @@ -112,7 +112,7 @@ __weak_reference(_pthread_mutex_getspinloops_np, pthread_mutex_getspinloops_np); __weak_reference(__pthread_mutex_setyieldloops_np, pthread_mutex_setyieldloops_np); __weak_reference(_pthread_mutex_getyieldloops_np, pthread_mutex_getyieldloops_np); -__weak_reference(_pthread_mutex_islocked_np, pthread_mutex_islocked_np); +__weak_reference(_pthread_mutex_isowned_np, pthread_mutex_isowned_np); static int mutex_init(pthread_mutex_t *mutex, @@ -867,7 +867,7 @@ __pthread_mutex_setyieldloops_np(pthread_mutex_t *mutex, int count) } int -_pthread_mutex_islocked_np(pthread_mutex_t *mutex) +_pthread_mutex_isowned_np(pthread_mutex_t *mutex) { struct pthread *curthread = _get_curthread(); int ret;