libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* fhandler.cc (fhandler_base_overlapped::has_ongoing_io): Don't block 

GetOverlappedResult since previous IsEventSignalled will have reset the handle.
* select.cc (cygwin_select): Remove space before parentheses in syscall
debugging output.
(pipe_data_available): Streamline if block.
This commit is contained in:
Christopher Faylor 2012-02-01 05:27:42 +00:00
parent d3cb1dffef
commit ee766fda68
3 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,12 @@
2012-02-01 Christopher Faylor <me.cygwin2012@cgf.cx>
* fhandler.cc (fhandler_base_overlapped::has_ongoing_io): Don't block
GetOverlappedResult since previous IsEventSignalled will have reset the
handle.
* select.cc (cygwin_select): Remove space before parentheses in syscall
debugging output.
(pipe_data_available): Streamline if block.
2012-01-31 Christopher Faylor <me.cygwin2012@cgf.cx> 2012-01-31 Christopher Faylor <me.cygwin2012@cgf.cx>
* syscalls.cc (dup3): Fix debug typo. * syscalls.cc (dup3): Fix debug typo.

2
winsup/cygwin/fhandler.cc
View File

@ -1900,7 +1900,7 @@ fhandler_base_overlapped::has_ongoing_io ()
return true; return true;
io_pending = false; io_pending = false;
DWORD nbytes; DWORD nbytes;
GetOverlappedResult (get_output_handle (), get_overlapped (), &nbytes, true); GetOverlappedResult (get_output_handle (), get_overlapped (), &nbytes, false);
return false; return false;
} }

31
winsup/cygwin/select.cc
View File

@ -490,13 +490,10 @@ pipe_data_available (int fd, fhandler_base *fh, HANDLE h, bool writing)
IO_STATUS_BLOCK iosb = {0}; IO_STATUS_BLOCK iosb = {0};
FILE_PIPE_LOCAL_INFORMATION fpli = {0}; FILE_PIPE_LOCAL_INFORMATION fpli = {0};
bool res = false; bool res;
if (!fh->has_ongoing_io ()) if (fh->has_ongoing_io ())
{ res = false;
if (NtQueryInformationFile (h, else if (NtQueryInformationFile (h, &iosb, &fpli, sizeof (fpli),
&iosb,
&fpli,
sizeof (fpli),
FilePipeLocalInformation)) FilePipeLocalInformation))
{ {
/* If NtQueryInformationFile fails, optimistically assume the /* If NtQueryInformationFile fails, optimistically assume the
@ -509,35 +506,27 @@ pipe_data_available (int fd, fhandler_base *fh, HANDLE h, bool writing)
} }
else if (!writing) else if (!writing)
{ {
paranoid_printf ("fd %d, %s, read avail %u", fd, fh->get_name (),
fpli.ReadDataAvailable);
res = !!fpli.ReadDataAvailable; res = !!fpli.ReadDataAvailable;
paranoid_printf ("fd %d, %s, read avail %u", fd, fh->get_name (), fpli.ReadDataAvailable);
} }
else else if ((res = (fpli.WriteQuotaAvailable = (fpli.OutboundQuota -
{ fpli.ReadDataAvailable))))
/* If there is anything available in the pipe buffer then signal /* If there is anything available in the pipe buffer then signal
that. This means that a pipe could still block since you could that. This means that a pipe could still block since you could
be trying to write more to the pipe than is available in the be trying to write more to the pipe than is available in the
buffer but that is the hazard of select(). */ buffer but that is the hazard of select(). */
if ((fpli.WriteQuotaAvailable = (fpli.OutboundQuota - fpli.ReadDataAvailable)))
{
paranoid_printf ("fd %d, %s, write: size %lu, avail %lu", fd, paranoid_printf ("fd %d, %s, write: size %lu, avail %lu", fd,
fh->get_name (), fpli.OutboundQuota, fh->get_name (), fpli.OutboundQuota,
fpli.WriteQuotaAvailable); fpli.WriteQuotaAvailable);
res = true; else if ((res = (fpli.OutboundQuota < PIPE_BUF &&
} fpli.WriteQuotaAvailable == fpli.OutboundQuota)))
/* If we somehow inherit a tiny pipe (size < PIPE_BUF), then consider /* If we somehow inherit a tiny pipe (size < PIPE_BUF), then consider
the pipe writable only if it is completely empty, to minimize the the pipe writable only if it is completely empty, to minimize the
probability that a subsequent write will block. */ probability that a subsequent write will block. */
else if (fpli.OutboundQuota < PIPE_BUF &&
fpli.WriteQuotaAvailable == fpli.OutboundQuota)
{
select_printf ("fd, %s, write tiny pipe: size %lu, avail %lu", select_printf ("fd, %s, write tiny pipe: size %lu, avail %lu",
fd, fh->get_name (), fpli.OutboundQuota, fd, fh->get_name (), fpli.OutboundQuota,
fpli.WriteQuotaAvailable); fpli.WriteQuotaAvailable);
res = true;
}
}
}
return res ?: -!!(fpli.NamedPipeState & FILE_PIPE_CLOSING_STATE); return res ?: -!!(fpli.NamedPipeState & FILE_PIPE_CLOSING_STATE);
} }