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/cleanup1.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'tests/cleanup1.c')

diff --git a/tests/cleanup1.c b/tests/cleanup1.c
index 2b2ffe4..52a67c7 100644
--- a/tests/cleanup1.c
+++ b/tests/cleanup1.c
@@ -89,6 +89,7 @@ static void
 #ifdef __CLEANUP_C
 __cdecl
 #endif
+
 increment_pop_count(void * arg)
 {
   int * c = (int *) arg;
@@ -112,6 +113,9 @@ mythread(void * arg)
 
   assert(pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL) == 0);
 
+#ifdef _MSC_VER
+#pragma inline_depth(0)
+#endif
   pthread_cleanup_push(increment_pop_count, (void *) &pop_count);
   /*
    * We don't have true async cancelation - it relies on the thread
@@ -123,6 +127,9 @@ mythread(void * arg)
     Sleep(100);
 
   pthread_cleanup_pop(0);
+#ifdef _MSC_VER
+#pragma inline_depth(8)
+#endif
 
   return (void *) result;
 }
-- 
cgit v1.2.3