From 4a72430d821b96add23846980d07f5a01059029d Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Sat, 2 Feb 2002 23:15:28 +0000
Subject: 	* 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.
---
 tests/condvar9.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'tests/condvar9.c')

diff --git a/tests/condvar9.c b/tests/condvar9.c
index 48f4320..e06df17 100644
--- a/tests/condvar9.c
+++ b/tests/condvar9.c
@@ -121,12 +121,18 @@ mythread(void * arg)
    * pthread_cond_timedwait is a cancelation point and we
    * going to cancel one deliberately.
    */
+#ifdef _MSC_VER
+#pragma inline_depth(0)
+#endif
   pthread_cleanup_push(pthread_mutex_unlock, (void *) &cvthing.lock);
 
   while (! (cvthing.shared > 0))
     assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);
 
   pthread_cleanup_pop(0);
+#ifdef _MSC_VER
+#pragma inline_depth(8)
+#endif
 
   assert(cvthing.shared > 0);
 
@@ -218,9 +224,9 @@ main()
       failed = !threadbag[i].started;
 
       if (failed)
-        {
-          fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);
-        }
+	{
+	  fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);
+	}
     }
 
   /* 
-- 
cgit v1.2.3