* path.cc (mount_info::cygdrive_posix_path): Don't add trailing slash if

referring to something like c:\.
* dcrt0.cc (dll_crt0_1): Move uinfo initialization prior to sig_send
initialization to give signal thread a chance to finish.
* debug.cc (WFSO): Move to sigproc.cc
(WFMO): Ditto.
* exceptions.cc (interruptible): Allocate slightly more space for directory
just for paranoia's sake.
(call_handler): Eliminate nonmain argument.  Determine if main thread has set a
frame pointer and use it if so.
(sig_handle): Eliminate nonmain argument.
* net.cc: Record frame information in appropriate routines throughout.
* select.cc (select): Ditto.
* sigproc.cc: Use sigthread structure to record mainthread id throughout.
(sig_send): Record frame information for signal handler.
(wait_sig): Reflect argument change in sig_handle.
(WFSO): Move here and record frame information for signal handler.
(WFMO): Ditto.
* sigproc.h: Implement new "sigthread" class.  Implement "sigframe" class for
manipulating signal frame info.
* thread.cc (__pthread_kill): Use standard _kill() function rather than calling
sig_send directly.
* winsup.h: Eliminate ebp element from signal_dispatch class.

1 files changed, 49 insertions, 2 deletions

diff --git a/winsup/cygwin/sigproc.h b/winsup/cygwin/sigproc.h
index 0ef9e74a1..eee35748f 100644
--- a/winsup/cygwin/sigproc.h
+++ b/winsup/cygwin/sigproc.h
@@ -32,12 +32,60 @@ typedef struct struct_waitq
   HANDLE thread_ev;
 } waitq;
 
+class muto;
+
+struct sigthread
+{
+  DWORD id;
+  DWORD frame;
+  muto *lock;
+  sigthread () : id (0), frame (0), lock (0) {}
+};
+
+class sigframe
+{
+private:
+  sigthread *st;
+
+public:
+  void set (sigthread &t, int up = 1)
+  {
+    if (!t.lock)
+      t.lock = new_muto (FALSE, "sigthread");
+    t.lock->acquire ();
+    st = &t;
+    t.frame = (DWORD) (up ? __builtin_frame_address (1) :
+			   __builtin_frame_address (0));
+    t.lock->release ();
+  }
+
+  sigframe () {st = NULL;}
+  sigframe (sigthread &t, int up = 1)
+  {
+    if (!t.frame || t.id == GetCurrentThreadId ())
+      set (t, up);
+    else
+      st = NULL;
+  }
+  ~sigframe ()
+  {
+    if (st)
+      {
+	st->lock->acquire ();
+	st->frame = 0;
+	st->lock->release ();
+	st = NULL;
+      }
+  }
+};
+
+extern sigthread mainthread;
 extern HANDLE signal_arrived;
 
 BOOL __stdcall my_parent_is_alive ();
 extern "C" int __stdcall sig_dispatch_pending (int force = FALSE) __asm__ ("sig_dispatch_pending");
 extern "C" void __stdcall set_process_mask (sigset_t newmask);
-int __stdcall sig_handle (int, int);
+int __stdcall sig_handle (int);
 void __stdcall sig_clear (int);
 void __stdcall sig_set_pending (int);
 int __stdcall handle_sigsuspend (sigset_t);
@@ -53,7 +101,6 @@ void __stdcall signal_fixup_after_fork ();
 
 extern char myself_nowait_dummy[];
 extern char myself_nowait_nonmain_dummy[];
-extern DWORD maintid;
 extern HANDLE hExeced;		// Process handle of new window
 				//  process created by spawn_guts()