From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH] t7006: clean up SIGPIPE handling in trace2 tests
Date: Sun, 21 Nov 2021 21:49:32 -0800 [thread overview]
Message-ID: <xmqq5yskn3ir.fsf@gitster.g> (raw)
In-Reply-To: <YZsih3ar+g1ZTZOc@coredump.intra.peff.net> (Jeff King's message of "Sun, 21 Nov 2021 23:54:31 -0500")
Jeff King <peff@peff.net> writes:
> I'm tempted to say that this would be clearer if the in_signal code path
> just followed the main logic, like this:
>
> diff --git a/run-command.c b/run-command.c
> index f40df01c77..1f58c17b6c 100644
> --- a/run-command.c
> +++ b/run-command.c
> @@ -552,20 +552,17 @@ static int wait_or_whine(pid_t pid, const char *argv0, int in_signal)
>
> while ((waiting = waitpid(pid, &status, 0)) < 0 && errno == EINTR)
> ; /* nothing */
> - if (in_signal) {
> - if (WIFEXITED(status))
> - code = WEXITSTATUS(status);
> - return code;
> - }
>
> if (waiting < 0) {
> failed_errno = errno;
> - error_errno("waitpid for %s failed", argv0);
> + if (!in_signal)
> + error_errno("waitpid for %s failed", argv0);
> } else if (waiting != pid) {
> - error("waitpid is confused (%s)", argv0);
> + if (!in_signal)
> + error("waitpid is confused (%s)", argv0);
> } else if (WIFSIGNALED(status)) {
> code = WTERMSIG(status);
> - if (code != SIGINT && code != SIGQUIT && code != SIGPIPE)
> + if (!in_signal && code != SIGINT && code != SIGQUIT && code != SIGPIPE)
> error("%s died of signal %d", argv0, code);
> /*
> * This return value is chosen so that code & 0xff
> @@ -576,10 +573,12 @@ static int wait_or_whine(pid_t pid, const char *argv0, int in_signal)
> } else if (WIFEXITED(status)) {
> code = WEXITSTATUS(status);
> } else {
> - error("waitpid is confused (%s)", argv0);
> + if (!in_signal)
> + error("waitpid is confused (%s)", argv0);
> }
>
> - clear_child_for_cleanup(pid);
> + if (!in_signal)
> + clear_child_for_cleanup(pid);
>
> errno = failed_errno;
> return code;
>
> That's a lot more tedious "if (!in_signal)" checks, but:
>
> - we don't have to duplicate any of the actual application logic
>
> - we'd now cover the extra cases for waitpid failing or returning the
> wrong pid (previously if waitpid() failed we'd still look at status,
> which could contain complete garbage!)
Yeah, the repeated "if (!in_signal)" look a bit ugly, but fixing
that "we only deal with ifexited in in_signal case" to do the right
thing would make the code even more annoying and harder to maintain.
next prev parent reply other threads:[~2021-11-22 5:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-24 0:04 Is t7006-pager.sh racy? Junio C Hamano
2021-10-24 17:03 ` SZEDER Gábor
2021-10-25 17:41 ` Jeff King
2021-10-28 19:55 ` SZEDER Gábor
2021-10-28 22:10 ` Jeff King
2021-11-21 18:40 ` Jeff King
2021-11-21 22:05 ` Jeff King
2021-11-21 22:54 ` [PATCH] t7006: clean up SIGPIPE handling in trace2 tests Jeff King
2021-11-21 23:10 ` Jeff King
2021-11-22 2:17 ` Junio C Hamano
2021-11-22 4:51 ` Jeff King
2021-11-22 4:54 ` Jeff King
2021-11-22 5:49 ` Junio C Hamano [this message]
2021-11-22 6:05 ` Junio C Hamano
2021-11-22 19:11 ` Jeff King
2021-11-22 21:28 ` [PATCH] run-command: unify signal and regular logic for wait_or_whine() Jeff King
2021-12-01 14:03 ` Is t7006-pager.sh racy? Ævar Arnfjörð Bjarmason
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=xmqq5yskn3ir.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=szeder.dev@gmail.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.
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).