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

1 files changed, 162 insertions, 0 deletions

diff --git a/pthread_win32_attach_detach_np.c b/pthread_win32_attach_detach_np.c
new file mode 100644
index 0000000..487bcbb
--- /dev/null
+++ b/pthread_win32_attach_detach_np.c
@@ -0,0 +1,162 @@
+/*
+ * pthread_win32_attach_detach_np.c
+ *
+ * Description:
+ * This translation unit implements non-portable thread functions.
+ *
+ * --------------------------------------------------------------------------
+ *
+ *      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"
+
+/*
+ * Handle to kernel32.dll 
+ */
+static HINSTANCE ptw32_h_kernel32;
+
+BOOL
+pthread_win32_process_attach_np ()
+{
+  BOOL result = TRUE;
+
+  result = ptw32_processInitialize ();
+#ifdef _UWIN
+  pthread_count++;
+#endif
+
+#ifndef TEST_ICE
+
+  /*
+   * Load KERNEL32 and try to get address of InterlockedCompareExchange
+   */
+  ptw32_h_kernel32 = LoadLibrary(TEXT("KERNEL32.DLL"));
+
+  ptw32_interlocked_compare_exchange =
+    (PTW32_INTERLOCKED_LONG (WINAPI *)(PTW32_INTERLOCKED_LPLONG, PTW32_INTERLOCKED_LONG, PTW32_INTERLOCKED_LONG))
+#if defined(NEED_UNICODE_CONSTS)
+    GetProcAddress(ptw32_h_kernel32,
+                   (const TCHAR *)TEXT("InterlockedCompareExchange"));
+#else
+    GetProcAddress(ptw32_h_kernel32,
+                   (LPCSTR) "InterlockedCompareExchange");
+#endif
+
+  if (ptw32_interlocked_compare_exchange == NULL)
+    {
+      ptw32_interlocked_compare_exchange = ptw32_InterlockedCompareExchange;
+
+      /*
+       * If InterlockedCompareExchange is not being used, then free
+       * the kernel32.dll handle now, rather than leaving it until
+       * DLL_PROCESS_DETACH.
+       *
+       * Note: this is not a pedantic exercise in freeing unused
+       * resources!  It is a work-around for a bug in Windows 95
+       * (see microsoft knowledge base article, Q187684) which
+       * does Bad Things when FreeLibrary is called within
+       * the DLL_PROCESS_DETACH code, in certain situations.
+       * Since w95 just happens to be a platform which does not
+       * provide InterlockedCompareExchange, the bug will be
+       * effortlessly avoided.
+       */
+      (void) FreeLibrary(ptw32_h_kernel32);
+      ptw32_h_kernel32 = 0;
+    }
+
+#else /* TEST_ICE */
+
+  ptw32_interlocked_compare_exchange = ptw32_InterlockedCompareExchange;
+
+#endif /* TEST_ICE */
+
+  return result;
+}
+
+
+BOOL
+pthread_win32_process_detach_np ()
+{
+  if (ptw32_processInitialized)
+    {
+      pthread_t self = (pthread_t) pthread_getspecific (ptw32_selfThreadKey);
+
+      /*
+       * Detached threads have their resources automatically
+       * cleaned up upon exit (others must be 'joined').
+       */
+      if (self != NULL &&
+          self->detachState == PTHREAD_CREATE_DETACHED)
+        {
+          pthread_setspecific (ptw32_selfThreadKey, NULL);
+          ptw32_threadDestroy (self);
+        }
+
+      /*
+       * The DLL is being unmapped into the process's address space
+       */
+      ptw32_processTerminate ();
+
+      if (ptw32_h_kernel32)
+        {
+           (void) FreeLibrary(ptw32_h_kernel32);
+        }
+    }
+
+  return TRUE;
+}
+
+BOOL
+pthread_win32_thread_attach_np ()
+{
+  return TRUE;
+}
+
+BOOL
+pthread_win32_thread_detach_np ()
+{
+  if (ptw32_processInitialized)
+    {
+       pthread_t self = (pthread_t) pthread_getspecific (ptw32_selfThreadKey);
+
+       /*
+        * Detached threads have their resources automatically
+        * cleaned up upon exit (others must be 'joined').
+        */
+       if (self != NULL &&
+           self->detachState == PTHREAD_CREATE_DETACHED)
+         {
+           pthread_setspecific (ptw32_selfThreadKey, NULL);
+           ptw32_threadDestroy (self);
+         }
+    }
+
+  return TRUE;
+}