Major reorganisation of source code; new routine and tests added.

1 files changed, 373 insertions, 0 deletions

diff --git a/ptw32_threadStart.c b/ptw32_threadStart.c
new file mode 100644
index 0000000..442e6ec
--- /dev/null
+++ b/ptw32_threadStart.c
@@ -0,0 +1,373 @@
+/*
+ * ptw32_threadStart.c
+ *
+ * Description:
+ * This translation unit implements routines which are private to
+ * the implementation and may be used throughout it.
+ *
+ * --------------------------------------------------------------------------
+ *
+ *      Pthreads-win32 - POSIX Threads Library for Win32
+ *      Copyright(C) 1998 John E. Bossom
+ *      Copyright(C) 1999,2002 Pthreads-win32 contributors
+ * 
+ *      Contact Email: rpj@ise.canberra.edu.au
+ * 
+ *      The current list of contributors is contained
+ *      in the file CONTRIBUTORS included with the source
+ *      code distribution. The list can also be seen at the
+ *      following World Wide Web location:
+ *      http://sources.redhat.com/pthreads-win32/contributors.html
+ * 
+ *      This library is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU Lesser General Public
+ *      License as published by the Free Software Foundation; either
+ *      version 2 of the License, or (at your option) any later version.
+ * 
+ *      This library is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *      Lesser General Public License for more details.
+ * 
+ *      You should have received a copy of the GNU Lesser General Public
+ *      License along with this library in the file COPYING.LIB;
+ *      if not, write to the Free Software Foundation, Inc.,
+ *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include "pthread.h"
+#include "implement.h"
+
+
+#ifdef __CLEANUP_SEH
+
+static DWORD
+ExceptionFilter (EXCEPTION_POINTERS * ep, DWORD * ei)
+{
+  switch (ep->ExceptionRecord->ExceptionCode)
+    {
+      case EXCEPTION_PTW32_SERVICES:
+	{
+	  DWORD param;
+	  DWORD numParams = ep->ExceptionRecord->NumberParameters;
+
+	  numParams = (numParams > 3) ? 3 : numParams;
+
+	  for (param = 0; param < numParams; param++)
+	    {
+	      ei[param] = ep->ExceptionRecord->ExceptionInformation[param];
+	    }
+
+	  return EXCEPTION_EXECUTE_HANDLER;
+	  break;
+	}
+      default:
+	{
+	  /*
+	   * A system unexpected exception has occurred running the user's
+	   * routine. We need to cleanup before letting the exception
+	   * out of thread scope.
+	   */
+	  pthread_t self = pthread_self();
+
+	  (void) pthread_mutex_destroy(&self->cancelLock);
+	  ptw32_callUserDestroyRoutines(self);
+
+	  return EXCEPTION_CONTINUE_SEARCH;
+	  break;
+	}
+    }
+}
+
+#elif defined(__CLEANUP_CXX)
+
+#if defined(_MSC_VER)
+#include <eh.h>
+static terminate_function ptw32_oldTerminate;
+#else
+#include <new.h>
+static terminate_handler ptw32_oldTerminate;
+#endif
+
+#if 0
+#include <stdio.h>
+static pthread_mutex_t termLock = PTHREAD_MUTEX_INITIALIZER;
+#endif
+
+void
+ptw32_terminate ()
+{
+  pthread_t self = pthread_self();
+#if 0
+  FILE * fp;
+  pthread_mutex_lock(&termLock);
+  fp = fopen("pthread.log", "a");
+  fprintf(fp, "Terminate\n");
+  fclose(fp);
+  pthread_mutex_unlock(&termLock);
+#endif
+  set_terminate(ptw32_oldTerminate);
+  (void) pthread_mutex_destroy(&self->cancelLock);
+  ptw32_callUserDestroyRoutines(self);
+  terminate();
+}
+
+#endif /* _MSC_VER */
+
+#if ! defined (__MINGW32__) || defined (__MSVCRT__)
+unsigned __stdcall
+#else
+void
+#endif
+ptw32_threadStart (void * vthreadParms)
+{
+  ThreadParms *threadParms = (ThreadParms *) vthreadParms;
+  pthread_t self;
+  void *(*start) (void *);
+  void *arg;
+
+#ifdef __CLEANUP_SEH
+  DWORD ei[] = {0,0,0};
+#endif
+
+#ifdef __CLEANUP_C
+  int setjmp_rc;
+#endif
+
+  void * status = (void *) 0;
+
+  self = threadParms->tid;
+  start = threadParms->start;
+  arg = threadParms->arg;
+
+  free (threadParms);
+
+#if defined (__MINGW32__) && ! defined (__MSVCRT__)
+  /*
+   * beginthread does not return the thread id and is running
+   * before it returns us the thread handle, and so we do it here.
+   */
+  self->thread = GetCurrentThreadId ();
+  /*
+   * Here we're using cancelLock as a general-purpose lock
+   * to make the new thread wait until the creating thread
+   * has the new handle.
+   */
+  if (pthread_mutex_lock(&self->cancelLock) == 0)
+    {
+      (void) pthread_mutex_unlock(&self->cancelLock);
+    }
+#endif
+
+  pthread_setspecific (ptw32_selfThreadKey, self);
+
+  self->state = PThreadStateRunning;
+
+#ifdef __CLEANUP_SEH
+
+  __try
+  {
+    /*
+     * Run the caller's routine;
+     */
+    status = self->exitStatus = (*start) (arg);
+
+#ifdef _UWIN
+	if (--pthread_count <= 0)
+		exit(0);
+#endif
+
+  }
+  __except (ExceptionFilter(GetExceptionInformation(), ei))
+  {
+     switch (ei[0])
+       {
+	case PTW32_EPS_CANCEL:
+	  status = PTHREAD_CANCELED;
+#ifdef _UWIN
+		if (--pthread_count <= 0)
+			exit(0);
+#endif
+	  break;
+	case PTW32_EPS_EXIT:
+	  status = self->exitStatus;
+	  break;
+	default:
+	  status = PTHREAD_CANCELED;
+	  break;
+       }
+  }
+
+#else /* __CLEANUP_SEH */
+
+#ifdef __CLEANUP_C
+
+  setjmp_rc = setjmp( self->start_mark );
+
+  if( 0 == setjmp_rc ) {
+
+	  /*
+	   * Run the caller's routine;
+	   */
+	  status = self->exitStatus = (*start) (arg);
+  }
+
+  else {
+
+     switch (setjmp_rc)
+       {
+	case PTW32_EPS_CANCEL:
+	  status = PTHREAD_CANCELED;
+	  break;
+	case PTW32_EPS_EXIT:
+	  status = self->exitStatus;
+	  break;
+	default:
+	  status = PTHREAD_CANCELED;
+	  break;
+       }
+  }
+
+#else /* __CLEANUP_C */
+
+#ifdef __CLEANUP_CXX
+
+  ptw32_oldTerminate = set_terminate(&ptw32_terminate);
+
+  try
+  {
+    /*
+     * Run the caller's routine in a nested try block so that we
+     * can run the user's terminate function, which may call
+     * pthread_exit() or be canceled.
+     */
+    try
+      {
+	status = self->exitStatus = (*start) (arg);
+      }
+    catch (ptw32_exception &)
+      {
+	/*
+	 * Pass these through to the outer block.
+	 */
+	throw;
+      }
+    catch(...)
+     {
+       /*
+	* We want to run the user's terminate function if supplied.
+	* That function may call pthread_exit() or be canceled, which will
+	* be handled by the outer try block.
+	*
+	* ptw32_terminate() will be called if there is no user
+	* supplied function.
+	*/
+
+#if defined(_MSC_VER)
+       terminate_function term_func = set_terminate(0);
+#else
+       terminate_handler term_func = set_terminate(0);
+#endif
+
+       set_terminate(term_func);
+
+       if (term_func != 0) {
+	   term_func();
+       }
+
+       throw;
+     }
+  }
+  catch (ptw32_exception_cancel &)
+    {
+      /*
+       * Thread was canceled.
+       */
+      status = self->exitStatus = PTHREAD_CANCELED;
+    }
+  catch (ptw32_exception_exit &)
+    {
+      /*
+       * Thread was exited via pthread_exit().
+       */
+      status = self->exitStatus;
+    }
+  catch (...)
+    {
+      /*
+       * A system unexpected exception has occurred running the user's
+       * terminate routine. We get control back within this block - cleanup
+       * and release the exception out of thread scope.
+       */
+      status = self->exitStatus = PTHREAD_CANCELED;
+      (void) pthread_mutex_lock(&self->cancelLock);
+      self->state = PThreadStateException;
+      (void) pthread_mutex_unlock(&self->cancelLock);
+      (void) pthread_mutex_destroy(&self->cancelLock);
+      (void) set_terminate(ptw32_oldTerminate);
+      ptw32_callUserDestroyRoutines(self);
+      throw;
+
+      /*
+       * Never reached.
+       */
+    }
+
+  (void) set_terminate(ptw32_oldTerminate);
+
+#else
+
+#error ERROR [__FILE__, line __LINE__]: Cleanup type undefined.
+
+#endif /* __CLEANUP_CXX */
+#endif /* __CLEANUP_C */
+#endif /* __CLEANUP_SEH */
+
+  (void) pthread_mutex_lock(&self->cancelLock);
+  self->state = PThreadStateLast;
+  (void) pthread_mutex_unlock(&self->cancelLock);
+
+
+  (void) pthread_mutex_destroy(&self->cancelLock);
+
+#if 1
+  if (self->detachState == PTHREAD_CREATE_DETACHED)
+    {
+      /*
+       * We need to cleanup the pthread now in case we have
+       * been statically linked, in which case the cleanup
+       * in dllMain won't get done. Joinable threads will
+       * be cleaned up by pthread_join().
+       *
+       * Note that implicitly created pthreads (those created
+       * for Win32 threads which have called pthreads routines)
+       * must be cleaned up explicitly by the application 
+       * (by calling pthread_win32_thread_detach_np()) if
+       * this library has been statically linked. For the dll,
+       * dllMain will do the cleanup automatically.
+       */
+      (void) pthread_win32_thread_detach_np ();
+    }
+  else
+    {
+      ptw32_callUserDestroyRoutines (self);
+    }
+#else
+  ptw32_callUserDestroyRoutines (self);
+#endif
+
+#if ! defined (__MINGW32__) || defined (__MSVCRT__)
+  _endthreadex ((unsigned) status);
+#else
+  _endthread ();
+#endif
+
+  /*
+   * Never reached.
+   */
+
+#if ! defined (__MINGW32__) || defined (__MSVCRT__)
+  return (unsigned) status;
+#endif
+
+}				/* ptw32_threadStart */