* cygtls.h (struct _local_storage): Add thread storage pointers for

	memory used by socket select functions.  Combine them into a single
	struct select.
	* cygtls.cc: Accommodate above change throughout.
	(_cygtls::init_thread): Drop initalizing of sockevt to
	INVALID_HANDLE_VALUE.
	(_cygtls::fixup_after_fork): Reset sockevt to NULL.
	(_cygtls::remove): Don't use sockevt value to bail out prematurely.
	Set sockevt to NULL.  Free malloced select members.
	* select.h (struct select_socket_info): Drop max_w4 member.
	* select.cc (thread_socket): Use INFINITE timeout value if number of
	objects to wait for is <= MAXIMUM_WAIT_OBJECTS.  Use num_w4 member
	of select_socket_info struct rather than dropped max_w4.
	(init_tls_select_info): New inline function to initialize TLS select
	members.
	(start_thread_socket): Just call init_tls_select_info to initialize TLS
	select members and use them later on.
	(socket_cleanup): Don't free select_socket_info pointer members since
	they are thread local now.

1 files changed, 7 insertions, 6 deletions

diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc
index 1d8153a32..16743af46 100644
--- a/winsup/cygwin/cygtls.cc
+++ b/winsup/cygwin/cygtls.cc
@@ -96,7 +96,6 @@ _cygtls::init_thread (void *x, DWORD (*func) (void *, void *))
 
   thread_id = GetCurrentThreadId ();
   initialized = CYGTLS_INITIALIZED;
-  locals.select_sockevt = INVALID_HANDLE_VALUE;
   errno_addr = &(local_clib._errno);
 
   if ((void *) func == (void *) cygthread::stub
@@ -126,7 +125,7 @@ _cygtls::fixup_after_fork ()
       sig = 0;
     }
   stacklock = spinning = 0;
-  locals.select_sockevt = INVALID_HANDLE_VALUE;
+  locals.select.sockevt = NULL;
   wq.thread_ev = NULL;
 }
 
@@ -141,7 +140,7 @@ void
 _cygtls::remove (DWORD wait)
 {
   initialized = 0;
-  if (!locals.select_sockevt || exit_state >= ES_FINAL)
+  if (exit_state >= ES_FINAL)
     return;
 
   debug_printf ("wait %p", wait);
@@ -149,10 +148,12 @@ _cygtls::remove (DWORD wait)
     {
       /* FIXME: Need some sort of atthreadexit function to allow things like
 	 select to control this themselves. */
-      if (locals.select_sockevt != INVALID_HANDLE_VALUE)
+      if (!locals.select.sockevt)
 	{
-	  CloseHandle (locals.select_sockevt);
-	  locals.select_sockevt = (HANDLE) NULL;
+	  CloseHandle (locals.select.sockevt);
+	  locals.select.sockevt = NULL;
+	  free_local (select.ser_num);
+	  free_local (select.w4);
 	}
       free_local (process_ident);
       free_local (ntoa_buf);