* [PATCH 2/7] xap_client: attach PID to the IO object
2023-11-26 2:10 6% [PATCH 0/7] more I/O + process reliability and cleanups Eric Wong
@ 2023-11-26 2:11 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-11-26 2:11 UTC (permalink / raw)
To: meta
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}'
^ permalink raw reply related [relevance 7%]
* [PATCH 0/7] more I/O + process reliability and cleanups
@ 2023-11-26 2:10 6% Eric Wong
2023-11-26 2:11 7% ` [PATCH 2/7] xap_client: attach PID to the IO object Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-11-26 2:10 UTC (permalink / raw)
To: meta
6/7 ought to fix another hang in t/lei-q-save.t when writing to
v2 outputs.
Much of this stuff will be relevant to code search since Xapian
searches will be moved to C++ (if available) to support features
which aren't usable from Perl bindings and allow more
predictable performance anyways.
Eric Wong (7):
xap_helper_cxx: do not copy xap_helper.h source
xap_client: attach PID to the IO object
xap_client: pass arguments to top-level xap_helper
xap_helper: allow PI_NO_CXX to disable C++ in more places
git: move rbuf handling to PublicInbox::IO
git: improve coupling with {sock} and {inflight} fields
drop redundant calls to DS->Reset
lib/PublicInbox/CodeSearchIdx.pm | 11 +--
lib/PublicInbox/Daemon.pm | 1 -
lib/PublicInbox/Gcf2Client.pm | 7 +-
lib/PublicInbox/Git.pm | 138 ++++++++++++-------------------
lib/PublicInbox/GitAsyncCat.pm | 2 +-
lib/PublicInbox/IO.pm | 70 ++++++++++++++--
lib/PublicInbox/TestCommon.pm | 2 +-
lib/PublicInbox/Watch.pm | 6 +-
lib/PublicInbox/XapClient.pm | 9 +-
lib/PublicInbox/XapHelperCxx.pm | 11 +--
lib/PublicInbox/Xapcmd.pm | 6 +-
t/xap_helper.t | 5 +-
12 files changed, 145 insertions(+), 123 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-11-26 2:10 6% [PATCH 0/7] more I/O + process reliability and cleanups Eric Wong
2023-11-26 2:11 7% ` [PATCH 2/7] xap_client: attach PID to the IO object Eric Wong
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).