From: Stefan Beller <sbeller@google.com>
To: sbeller@google.com
Cc: tboegi@web.de, j6t@kdbg.org, gitster@pobox.com,
git@vger.kernel.org, johannes.schindelin@gmx.de
Subject: [PATCH 1/2] run-parallel: rename set_nonblocking to set_nonblocking_or_die
Date: Wed, 4 Nov 2015 14:43:48 -0800 [thread overview]
Message-ID: <1446677029-10745-2-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1446677029-10745-1-git-send-email-sbeller@google.com>
Discussion turned out a warning is not enough, but we need to die in case
of blocking output as we can lockup the child processes.
Junio wrote:
> Imagine that we are running two things A and B at the same time. We
> ask poll(2) and it says both A and B have some data ready to be
> read, and we try to read from A. strbuf_read_once() would try to
> read up to 8K, relying on the fact that you earlier set the IO to be
> nonblock. It will get stuck reading from A without allowing output
> from B to drain. B's write may get stuck because we are not reading
> from it, and would cause B to stop making progress.
> What if the other sides of the connection from A and B are talking
> with each other, and B's non-progress caused the processing for A on
> the other side of the connection to block, causing it not to produce
> more output to allow us to make progress reading from A (so that
> eventually we can give B a chance to drain its output)? Imagine A
> and B are pushes to the same remote, B may be pushing a change to a
> submodule while A may be pushing a matching change to its
> superproject, and the server may be trying to make sure that the
> submodule update completes and updates the ref before making the
> superproject's tree that binds that updated submodule's commit
> availble, for example? Can we make any progress from that point?
Signed-off-by: Stefan Beller <sbeller@google.com>
---
run-command.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/run-command.c b/run-command.c
index 0a3c24e..86fbe50 100644
--- a/run-command.c
+++ b/run-command.c
@@ -1006,15 +1006,13 @@ static void pp_cleanup(struct parallel_processes *pp)
sigchain_pop_common();
}
-static void set_nonblocking(int fd)
+static void set_nonblocking_or_die(int fd)
{
int flags = fcntl(fd, F_GETFL);
if (flags < 0)
- warning("Could not get file status flags, "
- "output will be degraded");
+ die("Could not get file status flags");
else if (fcntl(fd, F_SETFL, flags | O_NONBLOCK))
- warning("Could not set file status flags, "
- "output will be degraded");
+ die("Could not set file status flags");
}
/* returns
@@ -1052,7 +1050,7 @@ static int pp_start_one(struct parallel_processes *pp)
return code ? -1 : 1;
}
- set_nonblocking(pp->children[i].process.err);
+ set_nonblocking_or_die(pp->children[i].process.err);
pp->nr_processes++;
pp->children[i].in_use = 1;
--
2.6.1.247.ge8f2a41.dirty
next prev parent reply other threads:[~2015-11-04 22:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-02 2:58 git.git as of tonight Junio C Hamano
2015-11-02 21:15 ` Johannes Sixt
2015-11-02 22:16 ` Junio C Hamano
2015-11-02 23:06 ` Stefan Beller
2015-11-03 6:34 ` Johannes Sixt
2015-11-03 17:05 ` Junio C Hamano
2015-11-03 18:18 ` Stefan Beller
2015-11-03 21:03 ` Johannes Sixt
2015-11-03 23:00 ` Stefan Beller
2015-11-04 19:59 ` O_NONBLOCK under Windows (was: git.git as of tonight) Torsten Bögershausen
2015-11-04 20:07 ` Stefan Beller
2015-11-04 22:43 ` [PATCH 0/2] Missing " Stefan Beller
2015-11-04 22:43 ` Stefan Beller [this message]
2015-11-05 6:07 ` [PATCH 1/2] run-parallel: rename set_nonblocking to set_nonblocking_or_die Torsten Bögershausen
2015-11-05 6:14 ` Junio C Hamano
2015-11-05 6:19 ` Junio C Hamano
2015-11-05 6:58 ` Jeff King
2015-11-04 22:43 ` [PATCH 2/2] run-parallel: Run sequential if nonblocking I/O is unavailable Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1446677029-10745-2-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=johannes.schindelin@gmx.de \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).