summaryrefslogtreecommitdiff
path: root/pthread_testcancel.c
diff options
context:
space:
mode:
authorrpj <rpj>2011-05-06 02:11:50 +0000
committerrpj <rpj>2011-05-06 02:11:50 +0000
commit2fe8aba6a8a4ce09f353f34881c77f93a9c01ca3 (patch)
treefd7f179b1abaa525ec55e34bef23b12f8fd89021 /pthread_testcancel.c
parent941d7cf87c60b55342b51e0b0fcd748589b76167 (diff)
Robust mutexes merged from devel branchpost_merge_with_ROBUST_MUTEXES
Diffstat (limited to 'pthread_testcancel.c')
-rw-r--r--pthread_testcancel.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/pthread_testcancel.c b/pthread_testcancel.c
index 9686d9e..6658650 100644
--- a/pthread_testcancel.c
+++ b/pthread_testcancel.c
@@ -68,6 +68,7 @@ pthread_testcancel (void)
* ------------------------------------------------------
*/
{
+ ptw32_mcs_local_node_t stateLock;
pthread_t self = pthread_self ();
ptw32_thread_t * sp = (ptw32_thread_t *) self.p;
@@ -86,17 +87,17 @@ pthread_testcancel (void)
return;
}
- (void) pthread_mutex_lock (&sp->cancelLock);
+ ptw32_mcs_lock_acquire (&sp->stateLock, &stateLock);
if (sp->cancelState != PTHREAD_CANCEL_DISABLE)
{
ResetEvent(sp->cancelEvent);
sp->state = PThreadStateCanceling;
sp->cancelState = PTHREAD_CANCEL_DISABLE;
- (void) pthread_mutex_unlock (&sp->cancelLock);
+ ptw32_mcs_lock_release (&stateLock);
ptw32_throw (PTW32_EPS_CANCEL);
/* Never returns here */
}
- (void) pthread_mutex_unlock (&sp->cancelLock);
+ ptw32_mcs_lock_release (&stateLock);
} /* pthread_testcancel */