[PATCH 3/3] lei: give workers their own process group

[Eric Wong]

This lets users Ctrl-Z from their terminal to pause an entire
git-clone process hierarchy.
---
 lib/PublicInbox/LEI.pm        | 10 ++++++----
 lib/PublicInbox/LeiMirror.pm  |  3 +--
 lib/PublicInbox/LeiXSearch.pm |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 635cd0c5508a..145af7e2cb59 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -459,9 +459,9 @@ my @WQ_KEYS = qw(lxs l2m ikw pmd wq1 lne); # internal 
workers
 sub _drop_wq {
        my ($self) = @_;
        for my $wq (grep(defined, delete(@$self{@WQ_KEYS}))) {
-               if ($wq->wq_kill) {
+               if ($wq->wq_kill('-TERM')) {
                        $wq->wq_close(0, undef, $self);
-               } elsif ($wq->wq_kill_old) {
+               } elsif ($wq->wq_kill_old('-TERM')) {
                        $wq->wq_wait_old(undef, $self);
                }
                $wq->DESTROY;
@@ -575,6 +575,7 @@ sub _lei_atfork_child {
        } else { # worker, Net::NNTP (Net::Cmd) uses STDERR directly
                open STDERR, '+>&='.fileno($self->{2}) or warn "open $!";
                STDERR->autoflush(1);
+               POSIX::setpgid(0, $$) // die "setpgid(0, $$): $!";
        }
        close($_) for (grep(defined, delete @$self{qw(3 old_1 au_done)}));
        if (my $op_c = delete $self->{pkt_op_c}) {
@@ -1147,9 +1148,10 @@ sub event_step {
                if ($buf eq '') {
                        _drop_wq($self); # EOF, client disconnected
                        dclose($self);
-               } elsif ($buf =~ /\A(STOP|CONT)\z/) {
+               } elsif ($buf =~ /\A(?:STOP|CONT)\z/) {
+                       my $sig = "-$buf";
                        for my $wq (grep(defined, @$self{@WQ_KEYS})) {
-                               $wq->wq_kill($buf) or $wq->wq_kill_old($buf);
+                               $wq->wq_kill($sig) or $wq->wq_kill_old($sig);
                        }
                } else {
                        die "unrecognized client signal: $buf";
diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index fb73d8631670..f1bc82e27205 100644
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -9,7 +9,7 @@ use parent qw(PublicInbox::IPC);
 use PublicInbox::Config;
 use IO::Uncompress::Gunzip qw(gunzip $GunzipError);
 use IO::Compress::Gzip qw(gzip $GzipError);
-use PublicInbox::Spawn qw(popen_rd spawn run_die);
+use PublicInbox::Spawn qw(popen_rd spawn);
 use File::Temp ();
 use Fcntl qw(SEEK_SET O_CREAT O_EXCL O_WRONLY);
 use Carp qw(croak);
@@ -192,7 +192,6 @@ sub index_cloned_inbox {
 sub run_reap {
        my ($lei, $cmd, $opt) = @_;
        $lei->qerr("# @$cmd");
-       $opt->{pgid} = 0 if $lei->{sock};
        my $pid = spawn($cmd, undef, $opt);
        my $reap = PublicInbox::OnDestroy->new($lei->can('sigint_reap'), $pid);
        waitpid($pid, 0) == $pid or die "waitpid @$cmd: $!";
diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index ee9216feeb23..668d0b6e5df3 100644
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -469,7 +469,7 @@ sub do_post_augment {
        $err = $@;
        if ($err) {
                if (my $lxs = delete $lei->{lxs}) {
-                       $lxs->wq_kill;
+                       $lxs->wq_kill('-TERM');
                        $lxs->wq_close(0, undef, $lei);
                }
                $lei->fail("$err");
--
unsubscribe: one-click, see List-Unsubscribe header
archive: https://public-inbox.org/meta/