From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/6] git: qx: waitpid synchronously via ProcessPipe->CLOSE
Date: Fri, 1 Jan 2021 19:13:41 -1400 [thread overview]
Message-ID: <20210102091344.13477-4-e@80x24.org> (raw)
In-Reply-To: <20210102091344.13477-1-e@80x24.org>
If we're using ->qx, we're operating synchronously anyways,
so there's little point in relying on the event loop for
waitpid.
---
lib/PublicInbox/Git.pm | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index f7332bb6..cdd2b400 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -365,8 +365,17 @@ sub popen {
sub qx {
my $self = shift;
my $fh = $self->popen(@_);
- local $/ = wantarray ? "\n" : undef;
- <$fh>;
+ if (wantarray) {
+ local $/ = "\n";
+ my @ret = <$fh>;
+ close $fh; # caller should check $?
+ @ret;
+ } else {
+ local $/;
+ my $ret = <$fh>;
+ close $fh; # caller should check $?
+ $ret;
+ }
}
# check_async and cat_async may trigger the other, so ensure they're
next prev parent reply other threads:[~2021-01-02 9:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-02 9:13 [PATCH 0/6] process pipe improvements Eric Wong
2021-01-02 9:13 ` [PATCH 1/6] processpipe: allow synchronous close to set $? Eric Wong
2021-01-02 9:13 ` [PATCH 2/6] processpipe: lazy-require PublicInbox::DS for dwaitpid Eric Wong
2021-01-02 9:13 ` Eric Wong [this message]
2021-01-02 9:13 ` [PATCH 4/6] import: switch to using ProcessPipe Eric Wong
2021-01-02 9:13 ` [PATCH 5/6] git: manifest_entry: use ProcessPipe via popen_rd Eric Wong
2021-01-02 9:13 ` [PATCH 6/6] qspawn: switch to " Eric Wong
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://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210102091344.13477-4-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/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/public-inbox.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).