xap_client: attach PID to the IO object

As with our popen_* uses, we can simplify callers by using
attach_pid to handle automatic reaping upon close.

diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm
index 81ca5cbc88beb9e51e60798759e0b7f6f32cf5ba..3764f13e121ce6727bd3959dc4bc73ae76cbf828 100644 (file)
--- 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 dda5e044b3533991e7b9499b7464ba3cee51f43a..7737e30d5ed28a8e076e9e05b56d4bff68d45d0c 100644 (file)
--- 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 9e0b234d9fb332da7deeadfffe4053ef63d105f5..02e5ec7d303d174c427e2bef6405c5ffdfeca1c5 100644 (file)
--- 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}'