* exceptions.cc (exception::handle): Drop abbreviation for "exception" since I
never remember what it stands for. (sig_handle_tty_stop): Remove obsolete call to sig_handle_tty_stop. (_cygtls::call_signal_handler): Rework to grab signal information from _main_tls if none is set for _my_tls. Try harder to keep thread locked. (reset_signal_arrived): Delete. * fhandler.cc (fhandler_base_overlapped::wait_overlapped): Use new cygWFMO call to wait for an event + standard cygwin stuff. Modify debug output to acccomodate new function. * fhandler_console.cc (fhandler_console::read): Replace WaitForMultipleObjects with cygWFMO. * fhandler_socket.cc (get_inet_addr): Add comment. * gendef (_sigdelayed): Remove call to reset_signal_arrived. * sigproc.cc (_cygtls::signal_exit): Don't close my_readsig here unless we're in the signal thread. (create_signal_arrived): Create signal_arrived as auto-reset so that only one thread is woken when a signal arrives. * sigproc.h (cygWFMO): New function. (reset_signal_arrived): Delete declaration.
This commit is contained in:
@ -333,8 +333,6 @@ fhandler_console::read (void *pv, size_t& buflen)
|
||||
return;
|
||||
}
|
||||
|
||||
HANDLE w4[3] = { h, signal_arrived, pthread::get_cancel_event () };
|
||||
DWORD nwait = w4[2] ? 3 : 2;
|
||||
DWORD timeout = is_nonblocking () ? 0 : INFINITE;
|
||||
char tmp[60];
|
||||
|
||||
@ -350,7 +348,7 @@ fhandler_console::read (void *pv, size_t& buflen)
|
||||
|
||||
set_cursor_maybe (); /* to make cursor appear on the screen immediately */
|
||||
restart:
|
||||
switch (WaitForMultipleObjects (nwait, w4, FALSE, timeout))
|
||||
switch (cygWFMO (1, timeout, h))
|
||||
{
|
||||
case WAIT_OBJECT_0:
|
||||
break;
|
||||
|
Reference in New Issue
Block a user