From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/7] xap_client: attach PID to the IO object
Date: Sun, 26 Nov 2023 02:11:00 +0000 [thread overview]
Message-ID: <20231126021105.408573-3-e@80x24.org> (raw)
In-Reply-To: <20231126021105.408573-1-e@80x24.org>
As with our popen_* uses, we can simplify callers by using
attach_pid to handle automatic reaping upon close.
---
lib/PublicInbox/CodeSearchIdx.pm | 10 ++--------
lib/PublicInbox/XapClient.pm | 4 +++-
t/xap_helper.t | 3 +--
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm
index 81ca5cbc..3764f13e 100644
--- a/lib/PublicInbox/CodeSearchIdx.pm
+++ b/lib/PublicInbox/CodeSearchIdx.pm
@@ -516,15 +516,9 @@ sub shard_commit { # via wq_io_do
send($op_p, "shard_done $self->{shard}", 0);
}
-sub start_xhc () {
- my ($xhc, $pid) = PublicInbox::XapClient::start_helper("-j$NPROC");
- awaitpid($pid, \&cmd_done, ['xap_helper', "-j$NPROC"]);
- $xhc;
-}
-
sub dump_roots_start {
my ($self, $do_join) = @_;
- $XHC //= start_xhc;
+ $XHC //= PublicInbox::XapClient::start_helper("-j$NPROC");
$do_join // die 'BUG: no $do_join';
progress($self, 'dumping IDs from coderepos');
local $self->{xdb};
@@ -577,7 +571,7 @@ EOM
sub dump_ibx_start {
my ($self, $do_join) = @_;
- $XHC //= start_xhc;
+ $XHC //= PublicInbox::XapClient::start_helper("-j$NPROC");
my ($sort_opt, $fold_opt);
pipe(local $sort_opt->{0}, $DUMP_IBX_WPIPE);
pipe(local $fold_opt->{0}, local $sort_opt->{1});
diff --git a/lib/PublicInbox/XapClient.pm b/lib/PublicInbox/XapClient.pm
index dda5e044..7737e30d 100644
--- a/lib/PublicInbox/XapClient.pm
+++ b/lib/PublicInbox/XapClient.pm
@@ -41,7 +41,9 @@ sub start_helper {
$cls.'::start(@ARGV)', '--' ];
}
my $pid = spawn($cmd, $env, { 0 => $in });
- ((bless { io => $sock, impl => $cls }, __PACKAGE__), $pid);
+ my $self = bless { io => $sock, impl => $cls }, __PACKAGE__;
+ PublicInbox::IO::attach_pid($sock, $pid);
+ $self;
}
1;
diff --git a/t/xap_helper.t b/t/xap_helper.t
index 9e0b234d..02e5ec7d 100644
--- a/t/xap_helper.t
+++ b/t/xap_helper.t
@@ -173,8 +173,7 @@ my @id2root;
my $ar;
for my $n (@NO_CXX) {
local $ENV{PI_NO_CXX} = $n;
- my ($xhc, $pid) = PublicInbox::XapClient::start_helper('-j0');
- $ar = PublicInbox::AutoReap->new($pid);
+ my $xhc = PublicInbox::XapClient::start_helper('-j0');
pipe(my $err_r, my $err_w);
# git patch-id --stable <t/data/0001.patch | awk '{print $1}'
next prev parent reply other threads:[~2023-11-26 2:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-26 2:10 [PATCH 0/7] more I/O + process reliability and cleanups Eric Wong
2023-11-26 2:10 ` [PATCH 1/7] xap_helper_cxx: do not copy xap_helper.h source Eric Wong
2023-11-26 2:11 ` Eric Wong [this message]
2023-11-26 2:11 ` [PATCH 3/7] xap_client: pass arguments to top-level xap_helper Eric Wong
2023-11-26 2:11 ` [PATCH 4/7] xap_helper: allow PI_NO_CXX to disable C++ in more places Eric Wong
2023-11-26 2:11 ` [PATCH 5/7] git: move rbuf handling to PublicInbox::IO Eric Wong
2023-11-26 2:11 ` [PATCH 6/7] git: improve coupling with {sock} and {inflight} fields Eric Wong
2023-11-26 2:11 ` [PATCH 7/7] drop redundant calls to DS->Reset Eric Wong
2023-11-26 21:08 ` [PATCH v2] " 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=20231126021105.408573-3-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).