Re: [PATCH 1/5] run-command: Fix early shutdown

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 20, 2015, 18:41 UTC
Message-ID: <xmqqa8rd8jsg.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1445279086-31066-2-git-send-email-sbeller@google.com>

Stefan Beller <sbeller@google.com> writes:

Show 6 quoted lines

> 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>
> ---

Makes sense. The code could "break" out of the loop, leaving only one return site in the function, which would be a way to ensure that we'd consistently return the accumulated result, but this would also do.

Thanks.

Show 16 quoted lines

>  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");