diff options
| author | Christopher Faylor <me@cgf.cx> | 2011-12-04 18:32:00 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2011-12-04 18:32:00 +0000 |
| commit | 79e59d522afe5692c09ab21eade08947eca3ec19 (patch) | |
| tree | cd44280ba1c10616a5bb8d19ed01f2681d75045c /winsup/cygwin/fhandler_dsp.cc | |
| parent | 4510afa90d42eec08a2ec91f4203ed126ab998c8 (diff) | |
| download | cygnal-79e59d522afe5692c09ab21eade08947eca3ec19.tar.gz cygnal-79e59d522afe5692c09ab21eade08947eca3ec19.tar.bz2 cygnal-79e59d522afe5692c09ab21eade08947eca3ec19.zip | |
* sigproc.cc (cygWFMO): Don't assume that cancellable event is always
available.
* fhandler_dsp.cc (fhandler_dev_dsp::Audio_out::waitforspace): Use cygWFMO
instead of WaitForMultipleObjects.
(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.
* fhandler_tty.cc (fhandler_pty_slave::read): Ditto.
* select.cc (cygwin_select): Ditto for degenerate case.
Diffstat (limited to 'winsup/cygwin/fhandler_dsp.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_dsp.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/winsup/cygwin/fhandler_dsp.cc b/winsup/cygwin/fhandler_dsp.cc index fb363e19d..e46214fe5 100644 --- a/winsup/cygwin/fhandler_dsp.cc +++ b/winsup/cygwin/fhandler_dsp.cc @@ -540,10 +540,8 @@ fhandler_dev_dsp::Audio_out::waitforspace () set_errno (EAGAIN); return false; } - HANDLE w4[2] = { signal_arrived, pthread::get_cancel_event () }; - DWORD cnt = w4[1] ? 2 : 1; debug_printf ("100ms"); - switch (WaitForMultipleObjects (cnt, w4, FALSE, 100)) + switch (cygWFMO (0, 100)) { case WAIT_OBJECT_0: if (!_my_tls.call_signal_handler ()) @@ -920,10 +918,8 @@ fhandler_dev_dsp::Audio_in::waitfordata () set_errno (EAGAIN); return false; } - HANDLE w4[2] = { signal_arrived, pthread::get_cancel_event () }; - DWORD cnt = w4[1] ? 2 : 1; debug_printf ("100ms"); - switch (WaitForMultipleObjects (cnt, w4, FALSE, 100)) + switch (cygWFMO (0, 100)) { case WAIT_OBJECT_0: if (!_my_tls.call_signal_handler ()) |