* cygtls.h (_threadinfo::call): Remove regparm declaration to work around

compiler bug.
* autoload.cc (TryEnterCriticalSection): Remove.
* dcrt0.cc (dll_crt0_0): Delete inappropriate setting of _my_tls.stackptr to
NULL since it has really bad consequences.  Make 'si' an automatic variable.
* cygtls.cc (_threadinfo::init_thread): Correct thinko which caused thread list
to be allocated every time.
* cygtls.h (CYGTLS_PADSIZE): Define as const int.
* sync.h: Make multiple inclusion safe.
(muto::next): Eliminate.
(muto::exiting_thread): New variable.
(muto::set_exiting_thread): New function.
(new_muto): Change to use different section for mutos since c++ give
inexplicable warning in some cases otherwise.
(new_muto1): Ditto.
* dcrt0.cc (do_exit): Call muto::set_exiting_thread here.
* sync.cc (muto_start): Eliminate.
(muto::acquire): Always give exiting thread a lock.  Never give thread a lock
if exiting.
(muto::release): Ditto for releasing.
* dtable.cc (dtable::init_lock): Unline function and define here.
* dtable.h (lock_cs): Define as a muto since critical sections seem to work
oddly on Windows Me.
(lock): Accommodate switch to muto.
(unlock): Ditto.
* exceptions.cc (setup_handler): Don't worry about acquiring mutos since that
hasn't mattered for a long time.
(signal_exit): Ditto: muto stuff will be handled automatically on exit now.
* Makefile.in (DLL_IMPORTS): Link advapi32 to ensure proper DLL initialization.
* autoload.cc (RegCloseKey): Arbitrarily choose this function as a "seed" to
pull the advapi32 link library in.  So, comment out the autoloading.
* cygtls.cc (_threadinfo::init_thread): Just clear CYGTLS_PADSIZE.
(_threadinfo::remove): Add debugging.
(_threadinfo::find_tls): Ditto.
* cygtls.h (_threadinfo::padding): Make zero length (for now?).
* dcrt0.cc (dll_crt0_0): Move more initialization here from dll_crt0_1.
(dll_crt0_1): See above.
* dtable.h (dtable::lock): Remove commented out critical section locking.
* dtable.h (dtable::init_lock): Remove commented out critical section locking.
* dtable.h (dtable::unlock): Remove commented out critical section locking.
* exceptions.cc (interruptible): bool'ize.
* init.cc (threadfunc_fe): Revert to storing threadfunc at stack bottom.
(munge_threadfunc): Ditto.  Avoid adding overhead to calibration_thread.
(prime_threads): Don't initialize tls stuff.
(dll_entry): Make minor change to initialization order.
* tlsoffsets.h: Regenerate.
* sigproc.cc (wait_sig): Add sanity check for end of process thread exit.
* select.h: Make minor formatting change.
* Makefile.in: Add still more -fomit-frame-pointer functions.
* dtable.h (dtable::lock): New function.
(dtable::unlock): New function.
(dtable::init_lock): New function.
* cygheap.h (HEAP_TLS): Declare new enum value.
(init_cygheap::threadlist): Declare new array.
(init_cygheap::sthreads): Declare new variable.
(cygheap_fdmanip::~cygheap_fdmanip): Use new dtable lock/unlock functions.
(cygheap_fdnew::cygheap_fdnew): Ditto.
(cygheap_fdget::cygheap_fdget): Ditto.
* dtable.cc (dtable_init): Initialize fdtab critical section.
(dtable::fixup_after_fork): Ditto.
(dtable::fixup_after_exec): Ditto.
(dtable::dup2): Use lock/unlock calls to protect access to fdtab.
(dtable::find_fifo): Ditto.
(dtable::fixup_before_fork): Ditto.
(dtable::fixup_before_exec): Ditto.
(dtable::set_file_pointers_for_exec): Ditto.
(dtable::vfork_child_dup): Ditto.
(dtable::vfork_parent_restore): Ditto.
* syscalls.cc (close_all_files): Ditto.
* sync.h (muto::acquired): Declare new function.
(new_muto1): Declare new macro used to specify name of muto storage.
* sync.cc (muto::acquired): Define new function.
* cygthread.cc (cygthread::stub): Remove signal chain removal call since it is
handled during initialization now.
* cygthread.cc (cygthread::simplestub): Remove signal chain removal call since
it is handled during initialization now.
* cygtls.cc (sentry): New class used for locking.  Use throughout.
(_threadinfo::reset_exception): Don't pop stack.
(_threadinfo::find_tls): Move from exceptions.cc.
(_threadinfo::init_thread): Initialize array of threads rather than linked
list.  Take second argument indicating thread function for this thread.
(_threadinfo::remove): Search thread array rather than linked list.  Use sentry
to lock.  Only unlock if we got the lock.
(_threadinfo::find_tls): Ditto for first two.
(handle_threadlist_exception): Handle exceptions when manipulating the thread
list in case of premature thread termination.
(_threadinfo::init_threadlist_exceptions): Ditto.
* cygtls.h (TLS_STACK_SIZE): Decrease size.
(_threadinfo::padding): Add element to avoid overwriting lower part of stack.
(_threadinfo::remove): Add a "wait" argument to control how long we wait for a
lock before removing.
* exceptions.cc (init_exception_handler): Make global.  Take argument to
control exception handler being set.
(ctrl_c_handler): Wait forever when removing self from signal chain.
(_threadinfo::find_tls): Move to cygtls.cc.
(sig_handle): Reorganize detection for thread-specific signals.
* heap.cc (heap_init): Rework slightly.  Make fatal error more verbose.  Remove
malloc initialization since it can't happen during dll attach.
* init.cc (search_for): Move address to search for on stack here.
(threadfunc_ix): Ditto for stack offset.  Make shared so that stack walk
potentially only has to be done once when cygwin processes are running.
(threadfunc_fe): Use standard tls to store thread function (may change back
later).
(calibration_thread): New function.  Potentially called to find threadfunc_ix.
(munge_threadfunc): Search for "search_for" value on stack.  Output warning
when thread func not found on stack.  Use standard tls to store thread
function.
(prime_threads): New function.  Called to prime thread front end.
(dll_entry): Call dll_crt0_0 here when DLL_PROCESS_ATTACH.  Call prime_threads
here.  Try to remove thread from signal list here.
* sigproc.cc (wait_sig): Initialize threadlist exception stuff here.
* thread.cc (pthread::exit): Pass argument to signal list remove function.
* thread.h: Remove obsolete *ResourceLock defines.
* tlsoffsets.h: Regenerate.
* winsup.h (spf): Define temporary debug macro to be deleted later.
* dcrt0.cc (dll_crt0_0): New function, called during DLL initialization.
Mainly consists of code pulled from dll_crt0_1.
(dll_crt0_1): See above.
(_dll_crt0): Wait for initial calibration thread to complete, if appropriate.
Move some stuff to dll_crt0_0.
(initialize_main_tls): Accommodate argument change to
_thread_info::init_thread.
* fork.cc (fork_child): Ditto.
(sync_with_child): Fix debug message.
* external.cc (cygwin_internal): Remove special considerations for
uninitialized dll since initialization happens during dll attach now.
* dlfcn.cc (dlopen): Remove obsolete *ResourceLock calls.
(dlclose): Ditto.
* cygheap.h (init_cygheap::close_ctty): Declare new function.
* cygheap.cc (init_cygheap::close_ctty): Define new function.
* syscalls.cc (close_all_files): Use close_ctty.
(setsid): Ditto.
* cygthread.cc (cygthread::stub): Remove exception initialization.
* cygthread.cc (cygthread::stub): Remove exception initialization.
(cygthread::simplestub): Ditto.
* thread.cc (pthread::thread_init_wrapper): Ditto.
* cygtls.cc (_last_thread): Make static.
(_threadinfo::call2): Initialize exception handler here.
(_threadinfo::find_tls): Move here.
* exceptions.cc (_threadinfo::find_tls): Move.
* dcrt0.cc (__api_fatal): Add prefix info to message here rather than including
it in every call to function.
* winsup.h (api_fatal): Accommodate above change.
* debug.cc (add_handle): Don't do anything if cygheap not around.
(mark_closed): Ditto.
* dll_init.cc (dll_list::detach): Fix debug output.
* fork.cc (sync_with_child): Ditto.
(vfork): Improve debug output.
* heap.cc (heap_init): Ditto.
* exceptions.cc (try_to_debug): Clarify message when debugger attaches.

1 files changed, 30 insertions, 57 deletions

diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 669b516ab..597c58e47 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -98,18 +98,22 @@ NO_COPY static struct
 // of code that handles exceptions.  The x86 on the other hand uses segment
 // register fs, offset 0 to point to the current exception handler.
 
-asm (".equ __except_list,0");
+extern exception_list *_except_list asm ("%fs:0");
 
-extern exception_list *_except_list asm ("%fs:__except_list");
-
-static void
-init_exception_handler (exception_list *el)
+void
+init_exception_handler (exception_list *el, exception_handler *eh)
 {
-  el->handler = handle_exceptions;
+  el->handler = eh;
   el->prev = _except_list;
   _except_list = el;
 }
 
+extern "C" void
+init_exceptions (exception_list *el)
+{
+  init_exception_handler (el, handle_exceptions);
+}
+
 void
 init_console_handler ()
 {
@@ -119,12 +123,6 @@ init_console_handler ()
 }
 
 extern "C" void
-init_exceptions (exception_list *el)
-{
-  init_exception_handler (el);
-}
-
-extern "C" void
 error_start_init (const char *buf)
 {
   if (!buf || !*buf)
@@ -363,6 +361,8 @@ try_to_debug (bool waitloop)
 	}
     }
 
+  small_printf ("*** starting debugger for pid %u\n",
+		cygwin_pid (GetCurrentProcessId ()));
   BOOL dbg;
   dbg = CreateProcess (NULL,
 		       debugger_command,
@@ -383,9 +383,9 @@ try_to_debug (bool waitloop)
 	return 1;
       SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_IDLE);
       while (!being_debugged ())
-	Sleep (0);
-      Sleep (2000);
-      small_printf ("*** continuing from debugger call\n");
+	low_priority_sleep (0);
+      small_printf ("*** continuing pid %u from debugger call\n",
+		    cygwin_pid (GetCurrentProcessId ()));
     }
 
   SetThreadPriority (GetCurrentThread (), prio);
@@ -615,7 +615,7 @@ sig_handle_tty_stop (int sig)
 }
 }
 
-int
+bool
 interruptible (DWORD pc)
 {
   int res;
@@ -633,11 +633,11 @@ interruptible (DWORD pc)
      GetThreadContext.  These resolve to a strange allocation base.
      These should *never* be treated as interruptible. */
   if (!h || m.State != MEM_COMMIT)
-    res = 0;
+    res = false;
   else if (h == user_data->hmodule)
-    res = 1;
+    res = true;
   else if (!GetModuleFileName (h, checkdir, windows_system_directory_length + 2))
-    res = 0;
+    res = false;
   else
     res = !strncasematch (windows_system_directory, checkdir,
 			  windows_system_directory_length);
@@ -666,7 +666,8 @@ _threadinfo::interrupt_setup (int sig, void *handler,
   /* Clear any waiting threads prior to dispatching to handler function */
   int res = SetEvent (signal_arrived);	// For an EINTR case
   proc_subproc (PROC_CLEARWAIT, 1);
-  sigproc_printf ("armed signal_arrived %p, res %d", signal_arrived, res);
+  sigproc_printf ("armed signal_arrived %p, sig %d, res %d", signal_arrived,
+		  sig, res);
 }
 
 bool
@@ -762,26 +763,16 @@ setup_handler (int sig, void *handler, struct sigaction& siga, _threadinfo *tls)
 
       // FIXME - add check for reentering of DLL here
 
-      muto *m;
-      /* FIXME: Make multi-thread aware */
-      for (m = muto_start.next;  m != NULL; m = m->next)
-	if (m->unstable () || m->owner () == cygthread::main_thread_id)
-	  {
-	    sigproc_printf ("suspended thread owns a muto (%s)", m->name);
-	    goto resume_thread;
-	  }
-
       cx.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER;
       if (!GetThreadContext (hth, &cx))
 	system_printf ("couldn't get context of main thread, %E");
       else if (interruptible (cx.Eip))
 	interrupted = tls->interrupt_now (&cx, sig, handler, siga);
 
-    resume_thread:
       res = ResumeThread (hth);
-
       if (interrupted)
 	break;
+
       sigproc_printf ("couldn't interrupt.  trying again.");
       low_priority_sleep (0);
     }
@@ -801,7 +792,7 @@ static BOOL WINAPI
 ctrl_c_handler (DWORD type)
 {
   static bool saw_close;
-  _my_tls.remove ();
+  _my_tls.remove (INFINITE);
 
   /* Return FALSE to prevent an "End task" dialog box from appearing
      for each Cygwin process window that's open when the computer
@@ -892,19 +883,6 @@ set_signal_mask (sigset_t newmask, sigset_t oldmask)
   return;
 }
 
-extern _threadinfo *_last_thread;
-
-_threadinfo *
-_threadinfo::find_tls (int sig)
-{
-  EnterCriticalSection (&protect_linked_list);
-  for (_threadinfo *t = _last_thread; t ; t = t->prev)
-    if (sigismember (&t->sigwait_mask, sig))
-      return t;
-  LeaveCriticalSection (&protect_linked_list);
-  return NULL;
-}
-
 int __stdcall
 sig_handle (int sig, sigset_t mask, int pid, _threadinfo *tls)
 {
@@ -924,15 +902,15 @@ sig_handle (int sig, sigset_t mask, int pid, _threadinfo *tls)
 
   int rc = 1;
   bool insigwait_mask = tls ? sigismember (&tls->sigwait_mask, sig) : false;
+  bool special_case = ISSTATE (myself, PID_STOPPED) || main_vfork->pid;
+  bool masked = sigismember (&mask, sig);
   if (sig != SIGKILL && sig != SIGSTOP
-      && (sigismember (&mask, sig)
-	  || (tls
-	      && (insigwait_mask || sigismember (&tls->sigmask, sig)))
-	  || main_vfork->pid
-	  || ISSTATE (myself, PID_STOPPED)))
+      && (special_case || main_vfork->pid || masked || insigwait_mask
+	  || (tls && sigismember (&tls->sigmask, sig))))
     {
       sigproc_printf ("signal %d blocked", sig);
-      if (insigwait_mask || (tls = _threadinfo::find_tls (sig)) != NULL)
+      if ((!special_case && !masked)
+	  && (insigwait_mask || (tls = _threadinfo::find_tls (sig)) != NULL))
 	goto thread_specific;
       rc = -1;
       goto done;
@@ -1045,12 +1023,6 @@ signal_exit (int rc)
   (void) SetThreadPriority (hMainThread, THREAD_PRIORITY_IDLE);
   (void) SetThreadPriority (GetCurrentThread (), THREAD_PRIORITY_TIME_CRITICAL);
 
-  /* Unlock any main thread mutos since we're executing with prejudice. */
-  muto *m;
-  for (m = muto_start.next;  m != NULL; m = m->next)
-    if (m->unstable () || m->owner () == cygthread::main_thread_id)
-      m->reset ();
-
   user_data->resourcelocks->Delete ();
   user_data->resourcelocks->Init ();
 
@@ -1114,6 +1086,7 @@ call_signal_handler_now ()
       sa_flags = _my_tls.sa_flags;
       int sig = _my_tls.sig;
       void (*sigfunc) (int) = _my_tls.func;
+
       (void) _my_tls.pop ();
 #ifdef DEBUGGING
       if (_my_tls.stackptr > (_my_tls.stack + 1))