From 538776b743aa11df19021f90161b13a02c7138be Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Sun, 2 Jan 2005 02:22:25 +0000
Subject: * cygthread.cc (cygthread::stub): Set inuse to false when exiting.
 (cygthread::cygthread): Actually pass name as argument to debugging output to
 avoid SEGV when strace'ing. (cygthread::release): Don't set stack_ptr to
 NULL, since it is only set once on first entry to a stub not on each stub
 iteration. (cygthead::exit_thread): Remove obsolete function. * cygthread.h
 (cygthread::exit_thread): Ditto.

---
 winsup/cygwin/cygthread.cc | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'winsup/cygwin/cygthread.cc')

diff --git a/winsup/cygwin/cygthread.cc b/winsup/cygwin/cygthread.cc
index 55022f370..989901232 100644
--- a/winsup/cygwin/cygthread.cc
+++ b/winsup/cygwin/cygthread.cc
@@ -63,8 +63,11 @@ cygthread::stub (VOID *arg)
 #endif
       else
 	{
-	  if (!info->func || exiting)
-	    return 0;
+	  if (exiting)
+	    {
+	      info->inuse = false;	// FIXME: Do we need this?
+	      return 0;
+	    }
 
 	  /* Cygwin threads should not call ExitThread directly */
 	  info->func (info->arg == cygself ? info : info->arg);
@@ -167,7 +170,7 @@ cygthread::cygthread (LPTHREAD_START_ROUTINE start, LPVOID param,
       while (!thread_sync)
 	low_priority_sleep (0);
       SetEvent (thread_sync);
-      thread_printf ("activated name '%s', thread_sync %p for thread %p", thread_sync, id);
+      thread_printf ("activated name '%s', thread_sync %p for thread %p", name, thread_sync, id);
     }
   else
     {
@@ -180,7 +183,7 @@ cygthread::cygthread (LPTHREAD_START_ROUTINE start, LPVOID param,
 			this, 0, &id);
       if (!h)
 	api_fatal ("thread handle not set - %p<%p>, %E", h, id);
-      thread_printf ("created name '%s', thread %p, id %p", __name, h, id);
+      thread_printf ("created name '%s', thread %p, id %p", name, h, id);
 #ifdef DEBUGGING
       terminated = false;
 #endif
@@ -224,16 +227,6 @@ HANDLE ()
   return ev;
 }
 
-/* Should only be called when the process is exiting since it
-   leaves an open thread slot. */
-void
-cygthread::exit_thread ()
-{
-  if (!is_freerange)
-    SetEvent (*this);
-  ExitThread (0);
-}
-
 void
 cygthread::release (bool nuke_h)
 {
@@ -241,9 +234,9 @@ cygthread::release (bool nuke_h)
     h = NULL;
 #ifdef DEBUGGING
   __oldname = __name;
+  debug_printf ("released thread '%s'", __oldname);
 #endif
   __name = NULL;
-  stack_ptr = NULL;
   func = NULL;
   if (!InterlockedExchange (&inuse, 0))
 #ifdef DEBUGGING
-- 
cgit v1.2.3