From 6eb5bba145940501ca972e4243d7417c8120d569 Mon Sep 17 00:00:00 2001 From: rpj Date: Sun, 6 Aug 2000 12:15:47 +0000 Subject: 2000-08-06 Ross Johnson * pthread.h: Remove #warning - VC++ doesn't accept it. 2000-08-05 Ross Johnson * pthread.h (PtW32CatchAll): Add macro. When compiling applications using VC++ with C++ EH rather than SEH 'PtW32CatchAll' must be used in place of any 'catch( ... )' if the application wants pthread cancelation or pthread_exit() to work. 2000-08-03 Ross Johnson * pthread.h: Add a base class Pthread_exception for library internal exceptions and change the "catch" re-define macro to use it. 2000-08-02 Ross Johnson * GNUmakefile (CFLAGS): Add -mthreads. Add new targets to generate cpp and asm output. * sync.c (pthread_join): Remove dead code. tests: 2000-08-06 Ross Johnson * ccl.bat: Add /nologo to remove extraneous output. * exception1.c (exceptionedThread): Init 'dummy'; put expression into if condition to prevent optimising away; remove unused variable. * cancel4.c (mythread): Cast return value to avoid warnings. * cancel2.c (mythread): Missing #endif. * condvar9.c (mythread): Cast return value to avoid warnings. * condvar8.c (mythread): Cast return value to avoid warnings. * condvar7.c (mythread): Cast return value to avoid warnings. * cleanup3.c (mythread): Cast return value to avoid warnings. * cleanup2.c (mythread): Cast return value to avoid warnings. * cleanup1.c (mythread): Cast return value to avoid warnings. * condvar5.c (mythread): Cast return value to avoid warnings. * condvar3.c (mythread): Cast return value to avoid warnings. * condvar6.c (mythread): Cast return value to avoid warnings. * condvar4.c (mythread): Cast return value to avoid warnings. 2000-08-05 Ross Johnson * cancel2.c: Use PtW32CatchAll macro if defined. * exception1.c: Use PtW32CatchAll macro if defined. 2000-08-02 Ross Johnson * tsd1.c: Fix typecasts of &result [g++ is now very fussy]. * test.h (assert): Return 0's explicitly to allay g++ errors. * join2.c: Add explicit typecasts. * join1.c: Add explicit typecasts. * join0.c: Add explicit typecasts. * eyal1.c: Add explicit typecasts. * count1.c (main): Add type cast to remove g++ parse warning [gcc-2.95.2 seems to have tightened up on this]. * Makefile (GLANG): Use c++ explicitly. Remove MSVC sections (was commented out). Add target to generate cpp output. --- private.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'private.c') diff --git a/private.c b/private.c index f374e27..03d27c3 100644 --- a/private.c +++ b/private.c @@ -184,11 +184,8 @@ _pthread_threadStart (ThreadParms * threadParms) pthread_t self; void *(*start) (void *); void *arg; - #ifdef _MSC_VER - DWORD ei[] = {0,0,0}; - #endif void * status; @@ -249,7 +246,8 @@ _pthread_threadStart (ThreadParms * threadParms) { /* * A system unexpected exception had occurred running the user's - * routine. We get control back within this block. + * routine. We get control back within this block because + * we can't allow the exception out of thread scope. */ status = PTHREAD_CANCELED; } @@ -271,7 +269,7 @@ _pthread_threadStart (ThreadParms * threadParms) /* * Thread was cancelled. */ - status = PTHREAD_CANCELED; + status = self->exitStatus = PTHREAD_CANCELED; } _pthread_catch (Pthread_exception_exit) { @@ -284,9 +282,10 @@ _pthread_threadStart (ThreadParms * threadParms) { /* * A system unexpected exception had occurred running the user's - * routine. We get control back within this block. + * routine. We get control back within this block because + * we can't allow the exception out of thread scope. */ - status = PTHREAD_CANCELED; + status = self->exitStatus = PTHREAD_CANCELED; } #else /* __cplusplus */ -- cgit v1.2.3