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.

2 files changed, 5 insertions, 9 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;