diff options
| author | Christopher Faylor <me@cgf.cx> | 2011-12-09 16:02:56 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2011-12-09 16:02:56 +0000 |
| commit | 57af01797e53a7a15187fa8ee8b1cad693116dd3 (patch) | |
| tree | 8d3ea456998f0d95e3c81e932ef2df4f171099c7 /winsup/cygwin/fhandler.cc | |
| parent | aaaaefc09030a8a047bf0a0ab112647ee8307af6 (diff) | |
| download | cygnal-57af01797e53a7a15187fa8ee8b1cad693116dd3.tar.gz cygnal-57af01797e53a7a15187fa8ee8b1cad693116dd3.tar.bz2 cygnal-57af01797e53a7a15187fa8ee8b1cad693116dd3.zip | |
Rename cygWFMO to cygwait throughout and use the magic of polymorphism to "wait
for stuff".
* fhandler.cc (fhandler_base_overlapped::wait_overlapped): Use simplified arg
form of cygwait.
* fhandler_console.cc (fhandler_console::read): Ditto.
* fhandler_audio.cc (fhandler_dev_dsp::Audio_out::waitforspac): Ditto.
(fhandler_dev_dsp::Audio_in::waitfordata): Ditto.
* fhandler_fifo.cc (fhandler_fifo::wait): Ditto.
* fhandler_serial.cc (fhandler_serial::raw_read): Ditto.
(fhandler_serial::raw_write): Ditto.
* select.cc (cygwin_select): Ditto.
* sigproc.h (cygwait): Rename from cygWFMO. Define two argument and single
argument forms of this function.
* fhandler_tty.cc (fhandler_pty_slave::open): Use method to query if tty is
open.
(fhandler_pty_slave::read): Send SIGHUP when master is detected as closed.
(fhandler_pty_common::close): Close input_available_event in callers since
master may need to signal it first.
(fhandler_pty_master::close): Lie and set input_available_event when closing,
then close input_available_event.
(fhandler_pty_slave::close): Close input_available_event explicitly here.
* tty.h (tty::is_master_closed): Declare new method.
Diffstat (limited to 'winsup/cygwin/fhandler.cc')
| -rw-r--r-- | winsup/cygwin/fhandler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index a29b1f235..48e114f28 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -1926,7 +1926,7 @@ fhandler_base_overlapped::wait_overlapped (bool inres, bool writing, DWORD *byte if (res == overlapped_unknown) { HANDLE h = writing ? get_output_handle () : get_handle (); - DWORD wfres = cygWFMO (1, INFINITE, get_overlapped ()->hEvent); + DWORD wfres = cygwait (get_overlapped ()->hEvent); /* Cancelling here to prevent races. It's possible that the I/O has completed already, in which case this is a no-op. Otherwise, WFMO returned because 1) This is a non-blocking call, 2) a signal |