From 6e3ac5c605d5062279178b3ea0b853d0e9cf7cc9 Mon Sep 17 00:00:00 2001 From: rpj Date: Thu, 10 Mar 2011 13:40:16 +0000 Subject: Replace global Critical Sections with MCS Queue locks --- pthread_mutex_destroy.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'pthread_mutex_destroy.c') diff --git a/pthread_mutex_destroy.c b/pthread_mutex_destroy.c index 95509b3..c9460dc 100644 --- a/pthread_mutex_destroy.c +++ b/pthread_mutex_destroy.c @@ -71,10 +71,6 @@ pthread_mutex_destroy (pthread_mutex_t * mutex) * be too late invalidating the mutex below since another thread * may already have entered mutex_lock and the check for a valid * *mutex != NULL. - * - * Note that this would be an unusual situation because it is not - * common that mutexes are destroyed while they are still in - * use by other threads. */ *mutex = NULL; @@ -112,10 +108,13 @@ pthread_mutex_destroy (pthread_mutex_t * mutex) } else { + ptw32_mcs_local_node_t node; + /* * See notes in ptw32_mutex_check_need_init() above also. */ - EnterCriticalSection (&ptw32_mutex_test_init_lock); + + ptw32_mcs_lock_acquire(&ptw32_mutex_test_init_lock, &node); /* * Check again. @@ -138,8 +137,7 @@ pthread_mutex_destroy (pthread_mutex_t * mutex) */ result = EBUSY; } - - LeaveCriticalSection (&ptw32_mutex_test_init_lock); + ptw32_mcs_lock_release(&node); } return (result); -- cgit v1.2.3