From c43e9340f1bebe97d8e8ea683ec7f2bf911b5a85 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 27 Nov 2015 14:39:11 +0100 Subject: 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 --- winsup/cygwin/cygserver_ipc.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'winsup/cygwin/cygserver_ipc.h') diff --git a/winsup/cygwin/cygserver_ipc.h b/winsup/cygwin/cygserver_ipc.h index 14495bc94..9631eacc2 100644 --- a/winsup/cygwin/cygserver_ipc.h +++ b/winsup/cygwin/cygserver_ipc.h @@ -43,10 +43,7 @@ ipc_set_proc_info (proc &blk, bool in_fork = false) blk.gidcnt = 0; blk.gidlist = NULL; blk.is_admin = false; - if (in_fork) - blk.signal_arrived = NULL; - else - _my_tls.set_signal_arrived (true, blk.signal_arrived); + blk.signal_arrived = in_fork ? NULL : _my_tls.get_signal_arrived (true); } #endif /* __INSIDE_CYGWIN__ */ -- cgit v1.2.3