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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,14 @@
2009-06-30 Christopher Faylor <me+cygwin@cgf.cx>
* fhandler.cc (fhandler_base::has_ongoing_io): Accept an argument
indicating 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.
2009-06-30 Corinna Vinschen <corinna@vinschen.de> 2009-06-30 Corinna Vinschen <corinna@vinschen.de>
* net.cc (fdsock): Set default socket buffer sizes to 65520. Change * net.cc (fdsock): Set default socket buffer sizes to 65520. Change

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 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) && WaitForSingleObject (get_overlapped ()->hEvent, 0) != WAIT_OBJECT_0)
{ {
set_errno (EAGAIN); set_errno (EAGAIN);
@ -1781,7 +1781,7 @@ fhandler_base::read_overlapped (void *ptr, size_t& len)
DWORD nbytes; DWORD nbytes;
while (1) while (1)
{ {
if (has_ongoing_io ()) if (has_ongoing_io (is_nonblocking ()))
{ {
nbytes = (DWORD) -1; nbytes = (DWORD) -1;
break; break;
@ -1801,7 +1801,7 @@ fhandler_base::write_overlapped (const void *ptr, size_t len)
DWORD nbytes; DWORD nbytes;
while (1) while (1)
{ {
if (has_ongoing_io ()) if (has_ongoing_io (is_nonblocking ()))
{ {
nbytes = (DWORD) -1; nbytes = (DWORD) -1;
break; break;

2
winsup/cygwin/fhandler.h
View File

@ -302,7 +302,7 @@ class fhandler_base
virtual char const *ttyname () { return get_name (); } virtual char const *ttyname () { return get_name (); }
virtual void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3))); virtual void __stdcall read (void *ptr, size_t& len) __attribute__ ((regparm (3)));
virtual void __stdcall read_overlapped (void *ptr, size_t& len) __attribute__ ((regparm (3))); virtual void __stdcall read_overlapped (void *ptr, size_t& len) __attribute__ ((regparm (3)));
virtual bool __stdcall has_ongoing_io () __attribute__ ((regparm (1))); virtual bool __stdcall has_ongoing_io (bool) __attribute__ ((regparm (2)));
virtual int write (const void *ptr, size_t len); virtual int write (const void *ptr, size_t len);
virtual int __stdcall write_overlapped (const void *ptr, size_t len); virtual int __stdcall write_overlapped (const void *ptr, size_t len);
virtual ssize_t readv (const struct iovec *, int iovcnt, ssize_t tot = -1); virtual ssize_t readv (const struct iovec *, int iovcnt, ssize_t tot = -1);

2
winsup/cygwin/select.cc
View File

@ -513,7 +513,7 @@ out:
else if (fh->get_device () == FH_PIPER) else if (fh->get_device () == FH_PIPER)
select_printf ("%s, select for write on read end of pipe", select_printf ("%s, select for write on read end of pipe",
fh->get_name ()); fh->get_name ());
else if (fh->has_ongoing_io ()) else if (fh->has_ongoing_io (true))
s->write_ready = false; s->write_ready = false;
else else
{ {