From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 6/9] xapcmd: use popen_rd for running xapian-compact
Date: Sat, 11 Jan 2020 22:35:00 +0000 [thread overview]
Message-ID: <20200111223503.24473-7-e@yhbt.net> (raw)
In-Reply-To: <20200111223503.24473-1-e@yhbt.net>
public-inbox-compact wrapper displays progress by default,
anyways, and there's not a lot of output, so simplify our
code by using popen_rd instead of spawn + optional pipe.
While we're at it use "while (<HANDLE>)" to display
progress as it happens, since "foreach (<$HANDLE>)"
slurps the contents into an array, first.
---
lib/PublicInbox/Xapcmd.pm | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index 4871378e..de2ef5c6 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -3,7 +3,7 @@
package PublicInbox::Xapcmd;
use strict;
use warnings;
-use PublicInbox::Spawn qw(which spawn);
+use PublicInbox::Spawn qw(which popen_rd);
use PublicInbox::Over;
use PublicInbox::SearchIdx;
use File::Temp 0.19 (); # ->newdir
@@ -277,7 +277,6 @@ sub compact ($$) {
my ($args, $opt) = @_;
my ($src, $newdir) = @$args;
my $dst = ref($newdir) ? $newdir->dirname : $newdir;
- my ($r, $w);
my $pfx = $opt->{-progress_pfx} ||= progress_pfx($src);
my $pr = $opt->{-progress};
my $rdr = {};
@@ -286,7 +285,6 @@ sub compact ($$) {
defined(my $dfd = $opt->{$fd}) or next;
$rdr->{$fd} = $dfd;
}
- $rdr->{1} = $w if $pr && pipe($r, $w);
# we rely on --no-renumber to keep docids synched to NNTP
my $cmd = [ $XAPIAN_COMPACT, '--no-renumber' ];
@@ -299,18 +297,14 @@ sub compact ($$) {
}
$pr->("$pfx `".join(' ', @$cmd)."'\n") if $pr;
push @$cmd, $src, $dst;
- my $pid = spawn($cmd, undef, $rdr);
- if ($pr) {
- close $w or die "close: \$w: $!";
- foreach (<$r>) {
+ my $rd = popen_rd($cmd, undef, $rdr);
+ while (<$rd>) {
+ if ($pr) {
s/\r/\r$pfx /g;
$pr->("$pfx $_");
}
}
- my $rp = waitpid($pid, 0);
- if ($? || $rp != $pid) {
- die join(' ', @$cmd)." failed: $? (pid=$pid, reaped=$rp)\n";
- }
+ close $rd or die join(' ', @$cmd)." failed: $?n";
}
sub cpdb_loop ($$$;$$) {
next prev parent reply other threads:[~2020-01-11 22:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-11 22:34 [PATCH 0/9] more small fixes and cleanups Eric Wong
2020-01-11 22:34 ` [PATCH 1/9] config: do not slurp entire cgitrc at once Eric Wong
2020-01-11 22:34 ` [PATCH 2/9] git: modified: don't slurp `rev-parse --branches' Eric Wong
2020-01-11 22:34 ` [PATCH 3/9] git: packed_bytes: use GLOB_NOSORT Eric Wong
2020-01-11 22:34 ` [PATCH 4/9] solver: path_a may be undef from /dev/null Eric Wong
2020-01-11 22:34 ` [PATCH 5/9] cgit: drop cgit_parse_hdr wrapper Eric Wong
2020-01-11 22:35 ` Eric Wong [this message]
2020-01-11 22:35 ` [PATCH 7/9] xt/git_async_cmp: do not slurp large OID list into memory Eric Wong
2020-01-11 22:35 ` [PATCH 8/9] t/solver_git: avoid uninitialized warnings in hostname generation Eric Wong
2020-01-11 22:35 ` [PATCH 9/9] use popen_rd for bidirectional pipes 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: https://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=20200111223503.24473-7-e@yhbt.net \
--to=e@yhbt.net \
--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).