From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, Stefan Beller <sbeller@google.com>
Subject: [PATCH 1/5] run-command: Fix early shutdown
Date: Mon, 19 Oct 2015 11:24:42 -0700 [thread overview]
Message-ID: <1445279086-31066-2-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1445279086-31066-1-git-send-email-sbeller@google.com>
The return value of `pp_collect_finished` indicates if we want to shutdown
the parallel processing early. Both returns from that function should
return any accumulated results.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
run-command.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/run-command.c b/run-command.c
index ef3da27..8f47c6e 100644
--- a/run-command.c
+++ b/run-command.c
@@ -1077,7 +1077,7 @@ static int pp_collect_finished(struct parallel_processes *pp)
while (pp->nr_processes > 0) {
pid = waitpid(-1, &wait_status, WNOHANG);
if (pid == 0)
- return 0;
+ return result;
if (pid < 0)
die_errno("wait");
--
2.5.0.285.g8fe9b61.dirty
next prev parent reply other threads:[~2015-10-19 18:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-19 18:24 [PATCH 0/5] Fixes for the parallel processing Stefan Beller
2015-10-19 18:24 ` Stefan Beller [this message]
2015-10-20 18:41 ` [PATCH 1/5] run-command: Fix early shutdown Junio C Hamano
2015-10-19 18:24 ` [PATCH 2/5] run-command: Call get_next_task with a clean child process Stefan Beller
2015-10-20 18:49 ` Junio C Hamano
2015-10-20 19:07 ` Stefan Beller
2015-10-19 18:24 ` [PATCH 3/5] run-command: Initialize the shutdown flag Stefan Beller
2015-10-19 18:24 ` [PATCH 4/5] test-run-command: test for gracefully aborting Stefan Beller
2015-10-19 18:24 ` [PATCH 5/5] test-run-command: Increase test coverage Stefan Beller
2015-10-20 18:53 ` Junio C Hamano
2015-10-20 19:05 ` Stefan Beller
2015-10-20 17:51 ` [PATCH 6/5] run-command: Fix missing output from late callbacks 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445279086-31066-2-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
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 NNTP newsgroup(s).