diff options
| author | rpj <rpj> | 2011-05-06 02:11:50 +0000 |
|---|---|---|
| committer | rpj <rpj> | 2011-05-06 02:11:50 +0000 |
| commit | 2fe8aba6a8a4ce09f353f34881c77f93a9c01ca3 (patch) | |
| tree | fd7f179b1abaa525ec55e34bef23b12f8fd89021 /w32_CancelableWait.c | |
| parent | 941d7cf87c60b55342b51e0b0fcd748589b76167 (diff) | |
Robust mutexes merged from devel branchpost_merge_with_ROBUST_MUTEXES
Diffstat (limited to 'w32_CancelableWait.c')
| -rw-r--r-- | w32_CancelableWait.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/w32_CancelableWait.c b/w32_CancelableWait.c index 97e15aa..070633e 100644 --- a/w32_CancelableWait.c +++ b/w32_CancelableWait.c @@ -110,21 +110,22 @@ ptw32_cancelable_wait (HANDLE waitHandle, DWORD timeout) if (sp != NULL) { + ptw32_mcs_local_node_t stateLock; /* * Should handle POSIX and implicit POSIX threads.. * Make sure we haven't been async-canceled in the meantime. */ - (void) pthread_mutex_lock (&sp->cancelLock); + ptw32_mcs_lock_acquire (&sp->stateLock, &stateLock); if (sp->state < PThreadStateCanceling) { 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 reached */ } - (void) pthread_mutex_unlock (&sp->cancelLock); + ptw32_mcs_lock_release (&stateLock); } /* Should never get to here. */ |