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

* fhandler_serial.cc (fhandler_serial::raw_read): Just call ReadFile

Browse Source 
directly in case of non-blocking I/O and handle result gracefully.
This commit is contained in:
Corinna Vinschen
2012-05-25 09:29:17 +00:00
parent 79f6dbe171
commit 96d5b7d17c
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,8 @@
2012-05-25 Corinna Vinschen <corinna@vinschen.de>
* fhandler_serial.cc (fhandler_serial::raw_read): Just call ReadFile
directly in case of non-blocking I/O and handle result gracefully.
2012-05-24 Corinna Vinschen <corinna@vinschen.de> 2012-05-24 Corinna Vinschen <corinna@vinschen.de>
* thread.cc (__cygwin_lock_lock): Replace null thread check with test * thread.cc (__cygwin_lock_lock): Replace null thread check with test

21
winsup/cygwin/fhandler_serial.cc
View File

@@ -71,7 +71,7 @@ fhandler_serial::raw_read (void *ptr, size_t& ulen)
termios_printf ("error detected %x", ev); termios_printf ("error detected %x", ev);
else if (st.cbInQue && !vtime_) else if (st.cbInQue && !vtime_)
inq = st.cbInQue; inq = st.cbInQue;
else if (!overlapped_armed) else if (!is_nonblocking () && !overlapped_armed)
{ {
if ((size_t) tot >= minchars) if ((size_t) tot >= minchars)
break; break;
@@ -83,16 +83,6 @@ fhandler_serial::raw_read (void *ptr, size_t& ulen)
} }
else if (GetLastError () != ERROR_IO_PENDING) else if (GetLastError () != ERROR_IO_PENDING)
goto err; goto err;
else if (is_nonblocking ())
{
PurgeComm (get_handle (), PURGE_RXABORT);
if (tot == 0)
{
tot = -1;
set_errno (EAGAIN);
}
goto out;
}
else else
{ {
overlapped_armed = 1; overlapped_armed = 1;
@@ -132,7 +122,14 @@ fhandler_serial::raw_read (void *ptr, size_t& ulen)
goto err; goto err;
else if (is_nonblocking ()) else if (is_nonblocking ())
{ {
PurgeComm (get_handle (), PURGE_RXABORT); /* Use CancelIo rather than PurgeComm (PURGE_RXABORT) since
PurgeComm apparently discards in-flight bytes while CancelIo
only stops the overlapped IO routine. */
CancelIo (get_handle ());
if (GetOverlappedResult (get_handle (), &io_status, &n, FALSE))
tot = n;
else if (GetLastError () != ERROR_IO_INCOMPLETE)
goto err;
if (tot == 0) if (tot == 0)
{ {
tot = -1; tot = -1;