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

1 files changed, 152 insertions, 0 deletions

diff --git a/pthread_join.c b/pthread_join.c
new file mode 100644
index 0000000..3c076e0
--- /dev/null
+++ b/pthread_join.c
@@ -0,0 +1,152 @@
+/*
+ * pthread_join.c
+ *
+ * Description:
+ * This translation unit implements functions related to thread
+ * synchronisation.
+ *
+ * --------------------------------------------------------------------------
+ *
+ *      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"
+
+
+int
+pthread_join (pthread_t thread, void **value_ptr)
+     /*
+      * ------------------------------------------------------
+      * DOCPUBLIC
+      *      This function waits for 'thread' to terminate and
+      *      returns the thread's exit value if 'value_ptr' is not
+      *      NULL. This also detaches the thread on successful
+      *      completion.
+      *
+      * PARAMETERS
+      *      thread
+      *              an instance of pthread_t
+      *
+      *      value_ptr
+      *              pointer to an instance of pointer to void
+      *
+      *
+      * DESCRIPTION
+      *      This function waits for 'thread' to terminate and
+      *      returns the thread's exit value if 'value_ptr' is not
+      *      NULL. This also detaches the thread on successful
+      *      completion.
+      *      NOTE:   detached threads cannot be joined or canceled
+      *
+      * RESULTS
+      *              0               'thread' has completed
+      *              EINVAL          thread is not a joinable thread,
+      *              ESRCH           no thread could be found with ID 'thread',
+      *              ENOENT          thread couldn't find it's own valid handle,
+      *              EDEADLK         attempt to join thread with self
+      *
+      * ------------------------------------------------------
+      */
+{
+  int result = 0;
+  pthread_t self;
+
+  self = pthread_self ();
+  if (self == NULL)
+    {
+       return ENOENT;
+    }
+
+  if (pthread_equal (self, thread) != 0)
+    {
+      result = EDEADLK;
+    }
+  else if (thread->detachState == PTHREAD_CREATE_DETACHED)
+    {
+      result = EINVAL;
+    }
+  else
+    {
+      /*
+       * Pthread_join is a cancelation point.
+       * If we are canceled then our target thread must not be
+       * detached (destroyed). This is guarranteed because
+       * pthreadCancelableWait will not return if we
+       * are canceled.
+       */
+      result = pthreadCancelableWait(thread->threadH);
+
+      if (result == 0)
+	{
+
+#if ! defined (__MINGW32__) || defined (__MSVCRT__)
+
+	  if (value_ptr != NULL
+	      && !GetExitCodeThread (thread->threadH, (LPDWORD) value_ptr))
+	    {
+	      result = ESRCH;
+	    }
+	  else
+	    {
+	      /*
+	       * The result of making multiple simultaneous calls to
+	       * pthread_join() specifying the same target is undefined.
+	       */
+	      ptw32_threadDestroy (thread);
+	    }
+
+#else /* __MINGW32__ && ! __MSVCRT__ */
+
+	  /*
+	   * If using CRTDLL, the thread may have exited, and endthread
+	   * will have closed the handle.
+	   */
+	  if (value_ptr != NULL)
+	    {
+	      *value_ptr = thread->exitStatus;
+	    }
+      
+	  /*
+	   * The result of making multiple simultaneous calls to
+	   * pthread_join() specifying the same target is undefined.
+	   */
+	  ptw32_threadDestroy (thread);
+
+#endif /* __MINGW32__ && ! __MSVCRT__ */
+
+	}
+      else
+	{
+	  result = ESRCH;
+	}
+    }
+
+  return (result);
+
+}				/* pthread_join */