1 files changed, 123 insertions, 32 deletions

diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc
index 2734cf536..5c9fa615f 100644
--- a/winsup/cygwin/cygtls.cc
+++ b/winsup/cygwin/cygtls.cc
@@ -1,6 +1,6 @@
-/* cygtls.h
+/* cygtls.cc
 
-   Copyright 2003 Red Hat, Inc.
+   Copyright 2003, 2004 Red Hat, Inc.
 
 This software is a copyrighted work licensed under the terms of the
 Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
@@ -11,11 +11,48 @@ details. */
 #include "cygtls.h"
 #include "assert.h"
 #include <syslog.h>
+#include <signal.h>
+#include "exceptions.h"
+#include "sync.h"
+#include "cygerrno.h"
+#include "path.h"
+#include "fhandler.h"
+#include "dtable.h"
+#include "cygheap.h"
+#include "cygthread.h"
+
+class sentry
+{
+  static muto *lock;
+  int destroy;
+public:
+  void init ();
+  bool acquired () {return lock->acquired ();}
+  sentry () {destroy = 0;}
+  sentry (DWORD wait) {destroy = lock->acquire (wait);}
+  ~sentry () {if (destroy) lock->release ();}
+  friend void _threadinfo::init ();
+};
+
+muto NO_COPY *sentry::lock;
 
-static _threadinfo NO_COPY dummy_thread;
-_threadinfo NO_COPY *_last_thread = &dummy_thread;
+static size_t NO_COPY nthreads;
 
-CRITICAL_SECTION NO_COPY _threadinfo::protect_linked_list;
+#define THREADLIST_CHUNK 256
+
+void
+_threadinfo::init ()
+{
+  if (cygheap->threadlist)
+    memset (cygheap->threadlist, 0, cygheap->sthreads * sizeof (cygheap->threadlist[0]));
+  else
+    {
+      cygheap->sthreads = THREADLIST_CHUNK;
+      cygheap->threadlist = (_threadinfo **) ccalloc (HEAP_TLS, cygheap->sthreads,
+						     sizeof (cygheap->threadlist[0]));
+    }
+  new_muto1 (sentry::lock, sentry_lock);
+}
 
 void
 _threadinfo::set_state (bool is_exception)
@@ -32,7 +69,6 @@ _threadinfo::reset_exception ()
       debug_printf ("resetting stack after an exception stack %p, stackptr %p", stack, stackptr);
 #endif
       set_state (false);
-      stackptr--;
     }
 }
 
@@ -47,22 +83,22 @@ _threadinfo::call (DWORD (*func) (void *, void *), void *arg)
 void
 _threadinfo::call2 (DWORD (*func) (void *, void *), void *arg, void *buf)
 {
-  _my_tls.init_thread (buf);
-  ExitThread (func (arg, buf));
-}
-
-void
-_threadinfo::init ()
-{
-  InitializeCriticalSection (&protect_linked_list);
+  exception_list except_entry;
+  /* Initialize this thread's ability to respond to things like
+     SIGSEGV or SIGFPE. */
+  init_exceptions (&except_entry);
+  _my_tls.init_thread (buf, func);
+  DWORD res = func (arg, buf);
+  _my_tls.remove (INFINITE);
+  ExitThread (res);
 }
 
 void
-_threadinfo::init_thread (void *x)
+_threadinfo::init_thread (void *x, DWORD (*func) (void *, void *))
 {
   if (x)
     {
-      memset (this, 0, sizeof (*this));
+      memset (this, 0, CYGTLS_PADSIZE);
       stackptr = stack;
       if (_GLOBAL_REENT)
 	{
@@ -76,30 +112,40 @@ _threadinfo::init_thread (void *x)
       locals.process_logmask = LOG_UPTO (LOG_DEBUG);
     }
 
-  EnterCriticalSection (&protect_linked_list);
-  prev = _last_thread;
-  _last_thread->next = this;
-  _last_thread = this;
-  LeaveCriticalSection (&protect_linked_list);
-
   set_state (false);
   errno_addr = &(local_clib._errno);
+
+  if ((void *) func == (void *) cygthread::stub
+      || (void *) func == (void *) cygthread::simplestub)
+    return;
+
+  sentry here (INFINITE);
+  if (nthreads >= cygheap->sthreads)
+    {
+      cygheap->threadlist = (_threadinfo **)
+	crealloc (cygheap->threadlist, (cygheap->sthreads += THREADLIST_CHUNK)
+		 * sizeof (cygheap->threadlist[0]));
+      memset (cygheap->threadlist + nthreads, 0, THREADLIST_CHUNK * sizeof (cygheap->threadlist[0]));
+    }
+
+  cygheap->threadlist[nthreads++] = this;
 }
 
 void
-_threadinfo::remove ()
+_threadinfo::remove (DWORD wait)
 {
-  EnterCriticalSection (&protect_linked_list);
-  if (prev)
+  debug_printf ("wait %p\n", wait);
+  sentry here (wait);
+  if (here.acquired ())
     {
-      prev->next = next;
-      if (next)
-	next->prev = prev;
-      if (this == _last_thread)
-	_last_thread = prev;
-      prev = next = NULL;
+      for (size_t i = 0; i < nthreads; i++)
+	if (&_my_tls == cygheap->threadlist[i])
+	  {
+	    if (i < --nthreads)
+	      cygheap->threadlist[i] = cygheap->threadlist[nthreads];
+	    break;
+	  }
     }
-  LeaveCriticalSection (&protect_linked_list);
 }
 
 void
@@ -123,3 +169,48 @@ _threadinfo::pop ()
   return res;
 }
 
+#define BAD_IX ((size_t) -1)
+static size_t NO_COPY threadlist_ix = BAD_IX;
+
+_threadinfo *
+_threadinfo::find_tls (int sig)
+{
+  debug_printf ("sig %d\n", sig);
+  sentry here (INFINITE);
+  __asm__ volatile (".equ _threadlist_exception_return,.");
+  _threadinfo *res = NULL;
+  for (threadlist_ix = 0; threadlist_ix < nthreads; threadlist_ix++)
+    if (sigismember (&(cygheap->threadlist[threadlist_ix]->sigwait_mask), sig))
+      {
+	res = cygheap->threadlist[threadlist_ix];
+	break;
+      }
+  threadlist_ix = BAD_IX;
+  return res;
+}
+
+extern "C" DWORD __stdcall RtlUnwind (void *, void *, void *, DWORD);
+static int
+handle_threadlist_exception (EXCEPTION_RECORD *e, void *frame, CONTEXT *, void *)
+{
+  small_printf ("in handle_threadlist_exception!\n");
+  if (e->ExceptionCode != STATUS_ACCESS_VIOLATION)
+    return 1;
+
+  sentry here;
+  if (threadlist_ix != BAD_IX || !here.acquired ())
+    return 1;
+
+  extern void *threadlist_exception_return;
+  cygheap->threadlist[threadlist_ix]->remove (INFINITE);
+  threadlist_ix = 0;
+  RtlUnwind (frame, threadlist_exception_return, e, 0);
+  return 0;
+}
+
+void
+_threadinfo::init_threadlist_exceptions (exception_list *el)
+{
+  extern void init_exception_handler (exception_list *, exception_handler *);
+  init_exception_handler (el, handle_threadlist_exception);
+}