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_win32_attach_detach_np.c | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'pthread_win32_attach_detach_np.c')

diff --git a/pthread_win32_attach_detach_np.c b/pthread_win32_attach_detach_np.c
index 8116dd7..98935fb 100644
--- a/pthread_win32_attach_detach_np.c
+++ b/pthread_win32_attach_detach_np.c
@@ -190,15 +190,39 @@ pthread_win32_thread_detach_np ()
 
       if (sp != NULL) // otherwise Win32 thread with no implicit POSIX handle.
 	{
+          ptw32_mcs_local_node_t stateLock;
+          ptw32_mcs_local_node_t listLock;
 	  ptw32_callUserDestroyRoutines (sp->ptHandle);
 
-	  (void) pthread_mutex_lock (&sp->cancelLock);
+	  ptw32_mcs_lock_acquire (&sp->stateLock, &stateLock);
 	  sp->state = PThreadStateLast;
 	  /*
 	   * If the thread is joinable at this point then it MUST be joined
 	   * or detached explicitly by the application.
 	   */
-	  (void) pthread_mutex_unlock (&sp->cancelLock);
+	  ptw32_mcs_lock_release (&stateLock);
+
+          /*
+           * Robust Mutexes
+           */
+          ptw32_mcs_lock_acquire(&sp->robustMxListLock, &listLock);
+          while (sp->robustMxList != NULL)
+            {
+              pthread_mutex_t mx = sp->robustMxList->mx;
+#if 1
+              ptw32_robust_mutex_quick_remove(&mx, sp);
+#else
+              ptw32_robust_mutex_quick_remove(&mx, sp);
+#endif
+              /*
+               * If there are no waiters then the next thread to block will
+               * sleep, wakeup immediately and then go back to sleep.
+               * See pthread_mutex_lock.c.
+               */
+              SetEvent(mx->event);
+            }
+          ptw32_mcs_lock_release(&listLock);
+
 
 	  if (sp->detachState == PTHREAD_CREATE_DETACHED)
 	    {
-- 
cgit v1.2.3