summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/exceptions.cc
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2015-11-27 14:39:11 +0100
committerCorinna Vinschen <corinna@vinschen.de>2015-11-27 14:39:11 +0100
commitc43e9340f1bebe97d8e8ea683ec7f2bf911b5a85 (patch)
tree22f894dae5dfa97f2938a2097baf1108f95eac06 /winsup/cygwin/exceptions.cc
parent9471b0b36da94b507196c4db9884ec48e1b3a41b (diff)
downloadcygnal-c43e9340f1bebe97d8e8ea683ec7f2bf911b5a85.tar.gz
cygnal-c43e9340f1bebe97d8e8ea683ec7f2bf911b5a85.tar.bz2
cygnal-c43e9340f1bebe97d8e8ea683ec7f2bf911b5a85.zip
Fix race condition when waiting for a signal
* cygtls.h (_cygtls::wait_signal_arrived): Renamed from set_signal_arrived. (_cygtls::set_signal_arrived): New function signalling signal_arrived. (_cygtls::reset_signal_arrived): Don't reset will_wait_for_signal. (_cygtls::unwait_signal_arrived): New function only resetting will_wait_for_signal. (class wait_signal_arrived): Rename from set_signal_arrived. Accommodate name change throughout Cygwin. (wait_signal_arrived::~wait_signal_arrived): Call _cygtls::unwait_signal_arrived. Add comment. * cygserver_ipc.h (ipc_set_proc_info): Fetch signal_arrived handle via call to _cygtls::get_signal_arrived. * exceptions.cc (_cygtls::interrupt_setup): Signal signal_arrived via call to _cygtls::set_signal_arrived. (_cygtls::handle_SIGCONT): Ditto. * fhandler_socket.cc (fhandler_socket::wait_for_events): Generate WSAEVENT array prior to entering wait loop. Add cancel event object if available. Remove calls to pthread_testcancel and just call pthread::static_cancel_self if the cancel event object is signalled. Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin/exceptions.cc')
-rw-r--r--winsup/cygwin/exceptions.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 9119a8c08..c3a45d288 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -972,7 +972,7 @@ _cygtls::interrupt_setup (siginfo_t& si, void *handler, struct sigaction& siga)
this->sig = si.si_signo; /* Should always be last thing set to avoid race */
if (incyg)
- SetEvent (get_signal_arrived (false));
+ set_signal_arrived ();
if (!have_execed)
proc_subproc (PROC_CLEARWAIT, 1);
@@ -1404,7 +1404,7 @@ _cygtls::handle_SIGCONT ()
else
{
sig = SIGCONT;
- SetEvent (signal_arrived); /* alert sig_handle_tty_stop */
+ set_signal_arrived (); /* alert sig_handle_tty_stop */
sigsent = true;
}
/* Clear pending stop signals */