Cygwin: pipes: drop "tiny pipe" handling

Given we return 1 already if WriteQuotaAvailable is > 0, the condition
for tiny pipes is never true.  Fix the comments.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2021-09-07 12:56:48 +02:00
parent 9d7fd8d416
commit 27b24069d1
1 changed files with 7 additions and 15 deletions

View File

@ -608,10 +608,12 @@ pipe_data_available (int fd, fhandler_base *fh, HANDLE h, bool writing)
} }
if (writing) if (writing)
{ {
/* If there is anything available in the pipe buffer then signal /* WriteQuotaAvailable is decremented by the number of bytes requested
that. This means that a pipe could still block since you could by a blocking reader on the other side of the pipe. Cygwin readers
be trying to write more to the pipe than is available in the are serialized and never request a number of bytes equivalent to the
buffer but that is the hazard of select(). */ full buffer size. So WriteQuotaAvailable is 0 only if either the
read buffer on the other side is really full, or if we have non-Cygwin
readers. */
if (fpli.WriteQuotaAvailable > 0) if (fpli.WriteQuotaAvailable > 0)
{ {
paranoid_printf ("fd %d, %s, write: size %u, avail %u", fd, paranoid_printf ("fd %d, %s, write: size %u, avail %u", fd,
@ -619,17 +621,7 @@ pipe_data_available (int fd, fhandler_base *fh, HANDLE h, bool writing)
fpli.WriteQuotaAvailable); fpli.WriteQuotaAvailable);
return 1; return 1;
} }
/* If we somehow inherit a tiny pipe (size < PIPE_BUF), then consider /* TODO: Buffer really full or non-Cygwin reader? */
the pipe writable only if it is completely empty, to minimize the
probability that a subsequent write will block. */
if (fpli.OutboundQuota < PIPE_BUF
&& fpli.WriteQuotaAvailable == fpli.OutboundQuota)
{
select_printf ("fd, %s, write tiny pipe: size %u, avail %u",
fd, fh->get_name (), fpli.OutboundQuota,
fpli.WriteQuotaAvailable);
return 1;
}
} }
else if (fpli.ReadDataAvailable) else if (fpli.ReadDataAvailable)
{ {