* cancel.c: Rearranged some code and introduced checks

	to disable cancelation at the start of a thread's cancelation
	run to prevent double cancelation. The main problem
	arises if a thread is canceling and then receives a subsequent
	async cancel request.
	* private.c: Likewise.
	* condvar.c: Place pragmas around cleanup_push/pop to turn
	off inline optimisation (/Obn where n>0 - MSVC only). Various
	optimisation switches in MSVC turn this on, which interferes with
	the way that cleanup handlers are run in C++ EH and SEH
	code. Application code compiled with inline optimisation must
	also wrap cleanup_push/pop blocks with the pragmas, e.g.
	  #pragma inline_depth(0)
	  pthread_cleanup_push(...)
	    ...
	  pthread_cleanup_pop(...)
	  #pragma inline_depth(8)
	* rwlock.c: Likewise.
	* mutex.c: Remove attempts to inline some functions.
	* signal.c: Modify misleading comment.

tests/
	* mutex8: New test.
	* mutex8n: New test.
	* mutex8e: New test.
	* mutex8r: New test.
	* cancel6a: New test.
	* cancel6d: New test.
	* cleanup0.c: Add pragmas for inline optimisation control.
	* cleanup1.c: Add pragmas for inline optimisation control.
	* cleanup2.c: Add pragmas for inline optimisation control.
	* cleanup3.c: Add pragmas for inline optimisation control.
	* condvar7.c: Add pragmas for inline optimisation control.
	* condvar8.c: Add pragmas for inline optimisation control.
	* condvar9.c: Add pragmas for inline optimisation control.

1 files changed, 13 insertions, 2 deletions

diff --git a/misc.c b/misc.c
index 0fbff03..63ec45a 100644
--- a/misc.c
+++ b/misc.c
@@ -355,9 +355,20 @@ ptw32_cancelable_wait (HANDLE waitHandle, DWORD timeout)
           if (self != NULL && !self->implicit)
             {
               /*
-               * Thread started with pthread_create
+               * Thread started with pthread_create.
+               * Make sure we haven't been async-canceled in the meantime.
                */
-	      ptw32_throw(PTW32_EPS_CANCEL);
+              (void) pthread_mutex_lock(&self->cancelLock);
+              if (self->state < PThreadStateCanceling)
+                {
+                  self->state = PThreadStateCanceling;
+                  self->cancelState = PTHREAD_CANCEL_DISABLE;
+                  (void) pthread_mutex_unlock(&self->cancelLock);
+                  ptw32_throw(PTW32_EPS_CANCEL);
+
+                  /* Never reached */
+                }
+              (void) pthread_mutex_unlock(&self->cancelLock);
             }
 
           /* Should never get to here. */