diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2015-11-27 14:39:11 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2015-11-27 14:39:11 +0100 |
| commit | c43e9340f1bebe97d8e8ea683ec7f2bf911b5a85 (patch) | |
| tree | 22f894dae5dfa97f2938a2097baf1108f95eac06 /winsup/cygwin/fhandler_windows.cc | |
| parent | 9471b0b36da94b507196c4db9884ec48e1b3a41b (diff) | |
| download | cygnal-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/fhandler_windows.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_windows.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/fhandler_windows.cc b/winsup/cygwin/fhandler_windows.cc index 5cafe13d9..a25812748 100644 --- a/winsup/cygwin/fhandler_windows.cc +++ b/winsup/cygwin/fhandler_windows.cc @@ -1,7 +1,7 @@ /* fhandler_windows.cc: code to access windows message queues. Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2011, 2012, - 2013 Red Hat, Inc. + 2013, 2015 Red Hat, Inc. Written by Sergey S. Okhapkin (sos@prospect.com.ru). Feedback and testing by Andy Piper (andyp@parallax.co.uk). @@ -92,7 +92,7 @@ fhandler_windows::read (void *buf, size_t& len) } HANDLE w4[2]; - set_signal_arrived here (w4[0]); + wait_signal_arrived here (w4[0]); DWORD cnt = 1; if ((w4[1] = pthread::get_cancel_event ()) != NULL) ++cnt; |