From db171f2f9435b98f05f33fcbc0dcf0c5cc1cb917 Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Thu, 24 Mar 2011 23:33:14 +0000
Subject: First pass of robust mutexes

---
 pthread_setcanceltype.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'pthread_setcanceltype.c')

diff --git a/pthread_setcanceltype.c b/pthread_setcanceltype.c
index 3fb3f0e..72b0af5 100644
--- a/pthread_setcanceltype.c
+++ b/pthread_setcanceltype.c
@@ -79,6 +79,7 @@ pthread_setcanceltype (int type, int *oldtype)
       * ------------------------------------------------------
       */
 {
+  ptw32_mcs_local_node_t stateLock;
   int result = 0;
   pthread_t self = pthread_self ();
   ptw32_thread_t * sp = (ptw32_thread_t *) self.p;
@@ -93,7 +94,7 @@ pthread_setcanceltype (int type, int *oldtype)
   /*
    * Lock for async-cancel safety.
    */
-  (void) pthread_mutex_lock (&sp->cancelLock);
+  ptw32_mcs_lock_acquire (&sp->stateLock, &stateLock);
 
   if (oldtype != NULL)
     {
@@ -112,13 +113,13 @@ pthread_setcanceltype (int type, int *oldtype)
       sp->state = PThreadStateCanceling;
       sp->cancelState = PTHREAD_CANCEL_DISABLE;
       ResetEvent (sp->cancelEvent);
-      (void) pthread_mutex_unlock (&sp->cancelLock);
+      ptw32_mcs_lock_release (&stateLock);
       ptw32_throw (PTW32_EPS_CANCEL);
 
       /* Never reached */
     }
 
-  (void) pthread_mutex_unlock (&sp->cancelLock);
+  ptw32_mcs_lock_release (&stateLock);
 
   return (result);
 
-- 
cgit v1.2.3