From 879f3ad5eefc0cb914e7fed1a219ebb11c995a99 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Wed, 15 Aug 2012 18:50:44 +0000
Subject: [PATCH] * cygtls.h (_cygtls::create_signal_arrived): New function.
 (_cygtls::set_signal_arrived): Lock creation of signal_arrived. * cygwait.cc
 (cancelable_wait): Ignore signal_arrived event if _my_tls 'sig' element does
 not exist. * exceptions.cc (_cygtls::interrupt_setup): Create signal_arrived
 if recipient thread has not created it.

---
 winsup/cygwin/ChangeLog     |  9 +++++++++
 winsup/cygwin/cygtls.h      | 10 +++++++++-
 winsup/cygwin/cygwait.cc    | 16 ++++++++++++----
 winsup/cygwin/exceptions.cc |  8 ++++++--
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b2ea1a0f6..3852cec6f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,12 @@
+2012-08-15  Christopher Faylor  <me.cygwin2012@cgf.cx>
+
+	* cygtls.h (_cygtls::create_signal_arrived): New function.
+	(_cygtls::set_signal_arrived): Lock creation of signal_arrived.
+	* cygwait.cc (cancelable_wait): Ignore signal_arrived event if _my_tls
+	'sig' element does not exist.
+	* exceptions.cc (_cygtls::interrupt_setup): Create signal_arrived if
+	recipient thread has not created it.
+
 2012-08-15  Christopher Faylor  <me.cygwin2012@cgf.cx>
 
 	* gendef: Tighten up whitespace detection.
diff --git a/winsup/cygwin/cygtls.h b/winsup/cygwin/cygtls.h
index d683cf837..134fde290 100644
--- a/winsup/cygwin/cygtls.h
+++ b/winsup/cygwin/cygtls.h
@@ -235,6 +235,10 @@ public:
   void lock () __attribute__ ((regparm (1)));
   void unlock () __attribute__ ((regparm (1)));
   bool locked () __attribute__ ((regparm (1)));
+  void create_signal_arrived ()
+  {
+    signal_arrived = CreateEvent (&sec_none_nih, false, false, NULL);
+  }
   void set_signal_arrived (bool setit, HANDLE& h)
   {
     if (!setit)
@@ -242,7 +246,11 @@ public:
     else
       {
 	if (!signal_arrived)
-	  signal_arrived = CreateEvent (&sec_none_nih, false, false, NULL);
+	  {
+	    lock ();
+	    create_signal_arrived ();
+	    unlock ();
+	  }
 	h = signal_arrived;
 	signal_waiting = true;
       }
diff --git a/winsup/cygwin/cygwait.cc b/winsup/cygwin/cygwait.cc
index ee7a705ef..e2592851d 100644
--- a/winsup/cygwin/cygwait.cc
+++ b/winsup/cygwin/cygwait.cc
@@ -79,10 +79,18 @@ cancelable_wait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask)
 	res = WAIT_TIMEOUT;
       else if (res != sig_n)
 	/* all set */;
-      else if (is_cw_sig_eintr)
-	res = WAIT_SIGNALED;	/* caller will deal with signals */
-      else if (_my_tls.call_signal_handler ())
-	continue;
+      else
+	{
+	  _my_tls.lock ();
+	  int sig = _my_tls.sig;
+	  _my_tls.unlock ();
+	  if (!sig)
+	    continue;
+	  if (is_cw_sig_eintr)
+	    res = WAIT_SIGNALED;	/* caller will deal with signals */
+	  else if (_my_tls.call_signal_handler ())
+	    continue;
+	}
       break;
     }
 
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 8df69f29d..6de1f16b9 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -796,8 +796,12 @@ _cygtls::interrupt_setup (int sig, void *handler, struct sigaction& siga)
 
   this->sig = sig;			// Should always be last thing set to avoid a race
 
-  if (incyg && signal_arrived)
-    SetEvent (signal_arrived);
+  if (incyg)
+    {
+      if (!signal_arrived)
+	create_signal_arrived ();
+      SetEvent (signal_arrived);
+    }
 
   proc_subproc (PROC_CLEARWAIT, 1);
   sigproc_printf ("armed signal_arrived %p, signal %d", signal_arrived, sig);