JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* sigproc.cc (cygWFMO): Don't assume that cancellable event is always

Browse Source 
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.
This commit is contained in:
Christopher Faylor
2011-12-04 18:32:00 +00:00
parent 4510afa90d
commit 79e59d522a
7 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
winsup/cygwin/fhandler_serial.cc
View File

@@ -94,12 +94,9 @@ fhandler_serial::raw_read (void *ptr, size_t& ulen)
}
else
{
HANDLE w4[3] = { io_status.hEvent, signal_arrived,
pthread::get_cancel_event () };
DWORD cnt = w4[2] ? 3 : 2;
overlapped_armed = 1;
restart:
switch (WaitForMultipleObjects (cnt, w4, FALSE, INFINITE))
switch (cygWFMO (1, INFINITE, io_status.hEvent))
{
case WAIT_OBJECT_0:
if (!GetOverlappedResult (get_handle (), &io_status, &n,
@@ -205,11 +202,8 @@ fhandler_serial::raw_write (const void *ptr, size_t len)
if (!is_nonblocking ())
{
HANDLE w4[3] = { write_status.hEvent, signal_arrived,
pthread::get_cancel_event () };
DWORD cnt = w4[2] ? 3 : 2;
restart:
switch (WaitForMultipleObjects (cnt, w4, FALSE, INFINITE))
switch (cygWFMO (1, INFINITE, write_status.hEvent))
{
case WAIT_OBJECT_0:
break;