Cygwin: FIFO: don't read from pipes that are closing

Don't try to read from fifo_client_handlers that are in the fc_closing
state.  Experiments have shown that this always yields
STATUS_PIPE_BROKEN, so it just wastes a Windows system call.

Re-order the values in enum fifo_client_connect_state to reflect the
new status of fc_closing.
This commit is contained in:
Ken Brown
2020-08-03 09:35:00 -04:00
parent 289af73a89
commit 251624a352
3 changed files with 5 additions and 12 deletions

View File

@@ -365,7 +365,7 @@ fhandler_fifo::cleanup_handlers ()
while (i < nhandlers)
{
if (fc_handler[i].get_state () < fc_closing)
if (fc_handler[i].get_state () < fc_connected)
delete_client_handler (i);
else
i++;
@@ -1280,7 +1280,7 @@ fhandler_fifo::raw_read (void *in_ptr, size_t& len)
for (j = 0; j < nhandlers; j++)
if (fc_handler[j].last_read)
break;
if (j < nhandlers && fc_handler[j].get_state () >= fc_closing)
if (j < nhandlers && fc_handler[j].get_state () >= fc_connected)
{
NTSTATUS status;
IO_STATUS_BLOCK io;
@@ -1315,7 +1315,7 @@ fhandler_fifo::raw_read (void *in_ptr, size_t& len)
/* Second pass. */
for (int i = 0; i < nhandlers; i++)
if (fc_handler[i].get_state () >= fc_closing)
if (fc_handler[i].get_state () >= fc_connected)
{
NTSTATUS status;
IO_STATUS_BLOCK io;