Skip to content

Commit

Permalink
Fix SSH hangs
Browse files Browse the repository at this point in the history
It was reported in git-for-windows/git#5199
that as of v3.5.4, cloning or fetching via SSH is hanging indefinitely.

Bisecting the problem points to 555afcb (Cygwin: select: set pipe
writable only if PIPE_BUF bytes left, 2024-08-18). That commit's
intention seems to look at the write buffer, and only report the pipe as
writable if there are more than one page (4kB) available.

However, the number that is looked up is the number of bytes that are
already in the buffer, ready to be read, and further analysis
shows that in the scenario described in the report, the number of
available bytes is substantially below `PIPE_BUF`, but as long as they
are not handled, there is apparently a dead-lock.

Since the old logic worked, and the new logic causes a dead-lock, let's
essentially revert 555afcb (Cygwin: select: set pipe writable only if
PIPE_BUF bytes left, 2024-08-18).

Note: This is not a straight revert, as the code in question has been
modified subsequently, and trying to revert the original commit would
cause merge conflicts. Therefore, the diff looks very different from the
reverse diff of the commit whose logic is reverted.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Oct 10, 2024
1 parent 1e8cf1a commit cbe555e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions winsup/cygwin/select.cc
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@ peek_pipe (select_record *s, bool from_select)
}
ssize_t n = pipe_data_available (s->fd, fh, h, PDA_SELECT | PDA_WRITE);
select_printf ("write: %s, n %d", fh->get_name (), n);
gotone += s->write_ready = (n >= PIPE_BUF);
gotone += s->write_ready = (n > 0);
if (n < 0 && s->except_selected)
gotone += s->except_ready = true;
}
Expand Down Expand Up @@ -990,7 +990,7 @@ peek_fifo (select_record *s, bool from_select)
ssize_t n = pipe_data_available (s->fd, fh, fh->get_handle (),
PDA_SELECT | PDA_WRITE);
select_printf ("write: %s, n %d", fh->get_name (), n);
gotone += s->write_ready = (n >= PIPE_BUF);
gotone += s->write_ready = (n > 0);
if (n < 0 && s->except_selected)
gotone += s->except_ready = true;
}
Expand Down Expand Up @@ -1416,7 +1416,7 @@ peek_pty_slave (select_record *s, bool from_select)
{
ssize_t n = pipe_data_available (s->fd, fh, h, PDA_SELECT | PDA_WRITE);
select_printf ("write: %s, n %d", fh->get_name (), n);
gotone += s->write_ready = (n >= PIPE_BUF);
gotone += s->write_ready = (n > 0);
if (n < 0 && s->except_selected)
gotone += s->except_ready = true;
}
Expand Down

0 comments on commit cbe555e

Please sign in to comment.