* cygthread.h (cygthread::terminate): Declare new function.

(cygthread::initialized): Change to 'int'.
* cygthread.cc (cygthread::stub): Exit thread if initialized < 0.
(cygthread::new): Ditto.
(cygthread::runner): Ditto.  Set initialized using xor to preserve sign.
(cygthread::terminate): New function.
* dcrt0.cc (do_exit): Call cygthread::terminate.

winsup/cygwin/ChangeLog

@@ -1,3 +1,14 @@
+2002-09-28  Christopher Faylor  <cgf@redhat.com>
+
+	* cygthread.h (cygthread::terminate): Declare new function.
+	(cygthread::initialized): Change to 'int'.
+	* cygthread.cc (cygthread::stub): Exit thread if initialized < 0.
+	(cygthread::new): Ditto.
+	(cygthread::runner): Ditto.  Set initialized using xor to preserve
+	sign.
+	(cygthread::terminate): New function.
+	* dcrt0.cc (do_exit): Call cygthread::terminate.
+
 2002-09-27  Robert Collins <rbtcollins@hotmail.com>
 
 	* thread.cc (pthread_key::run_destructor): Run_destructor is not

winsup/cygwin/cygthread.cc

@@ -19,7 +19,7 @@ static cygthread NO_COPY threads[6];
 #define NTHREADS (sizeof (threads) / sizeof (threads[0]))
 
 DWORD NO_COPY cygthread::main_thread_id;
-bool NO_COPY cygthread::initialized;
+int NO_COPY cygthread::initialized;
 
 /* Initial stub called by cygthread constructor. Performs initial
    per-thread initialization and loops waiting for new thread functions
@@ -68,6 +68,9 @@ cygthread::stub (VOID *arg)
 #endif
       SetEvent (info->ev);
       info->__name = NULL;
+      if (initialized < 0)
+	ExitThread (0);
+      else
 	SuspendThread (info->h);
     }
 }
@@ -78,9 +81,14 @@ DWORD WINAPI
 cygthread::runner (VOID *arg)
 {
   for (unsigned i = 0; i < NTHREADS; i++)
-    threads[i].h = CreateThread (&sec_none_nih, 0, cygthread::stub, &threads[i],
-				 CREATE_SUSPENDED, &threads[i].avail);
-  cygthread::initialized = true;
+    if (!initialized)
+      threads[i].h = CreateThread (&sec_none_nih, 0, cygthread::stub,
+				   &threads[i], CREATE_SUSPENDED,
+				   &threads[i].avail);
+    else
+      return 0;
+
+  initialized ^= 1;
   return 0;
 }
 
@@ -127,7 +135,10 @@ new (size_t)
 
   for (;;)
     {
-      bool was_initialized = initialized;
+      int was_initialized = initialized;
+      if (was_initialized < 0)
+	ExitThread (0);
+
       /* Search the threads array for an empty slot to use */
       for (info = threads + NTHREADS - 1; info >= threads; info--)
 	if ((id = (DWORD) InterlockedExchange ((LPLONG) &info->avail, 0)))
@@ -140,6 +151,9 @@ new (size_t)
 	    return info;
 	  }
 
+      if (was_initialized < 0)
+	ExitThread (0);
+
       if (!was_initialized)
 	Sleep (0); /* thread_runner is not finished yet. */
       else
@@ -259,3 +273,12 @@ cygthread::detach ()
 	}
     }
 }
+
+void
+cygthread::terminate ()
+{
+  initialized = -1;
+  for (cygthread *info = threads + NTHREADS - 1; info >= threads; info--)
+    if (!(DWORD) InterlockedExchange ((LPLONG) &info->avail, 0) && info->id)
+      SetEvent (info->ev);
+}

winsup/cygwin/cygthread.h

@@ -17,7 +17,7 @@ class cygthread
   VOID *arg;
   bool is_freerange;
   static DWORD main_thread_id;
-  static bool initialized;
+  static int initialized;
   static DWORD WINAPI runner (VOID *);
   static DWORD WINAPI free_runner (VOID *);
   static DWORD WINAPI stub (VOID *);
@@ -33,6 +33,7 @@ class cygthread
   void * operator new (size_t);
   static void * freerange ();
   void exit_thread ();
+  static void terminate ();
 };
 
 #define cygself NULL

winsup/cygwin/dcrt0.cc

@@ -1024,6 +1024,7 @@ do_exit (int status)
   window_terminate ();
   events_terminate ();
   shared_terminate ();
+  cygthread::terminate ();
 
   minimal_printf ("winpid %d, exit %d", GetCurrentProcessId (), n);
   myself->exit (n);

winsup/cygwin/thread.h

@@ -160,7 +160,7 @@ public:
   long magic;
 
   verifyable_object (long);
-   ~verifyable_object ();
+  virtual ~verifyable_object ();
 };
 
 typedef enum