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

* fhandler.cc (fhandler_base::has_ongoing_io): Accept an argument indicating

Browse Source 
whether the overlapped event should be tested.
(fhandler_base::read_overlapped): Pass is_overlapped state to has_ongoing_io.
(fhandler_base::write_overlapped): Ditto.
* fhandler.h (fhandler_base::has_ongoing_io): Accommodate argument change.
* select.cc (peek_pipe): Ditto.
This commit is contained in:
Christopher Faylor
2009-06-30 14:36:11 +00:00
parent 4a83803381
commit 840bb39798
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/fhandler.cc
View File

@@ -1764,9 +1764,9 @@ fhandler_base::wait_overlapped (bool inres, bool writing, DWORD *bytes, DWORD le
}
bool __stdcall
fhandler_base::has_ongoing_io ()
fhandler_base::has_ongoing_io (bool testit)
{
if (get_overlapped () && get_overlapped ()->hEvent
if (testit && get_overlapped () && get_overlapped ()->hEvent
&& WaitForSingleObject (get_overlapped ()->hEvent, 0) != WAIT_OBJECT_0)
{
set_errno (EAGAIN);
@@ -1781,7 +1781,7 @@ fhandler_base::read_overlapped (void *ptr, size_t& len)
DWORD nbytes;
while (1)
{
if (has_ongoing_io ())
if (has_ongoing_io (is_nonblocking ()))
{
nbytes = (DWORD) -1;
break;
@@ -1801,7 +1801,7 @@ fhandler_base::write_overlapped (const void *ptr, size_t len)
DWORD nbytes;
while (1)
{
if (has_ongoing_io ())
if (has_ongoing_io (is_nonblocking ()))
{
nbytes = (DWORD) -1;
break;