ipc: wq: support passing fields to workers

[public-inbox.git] / lib / PublicInbox / IPC.pm

diff --git a/lib/PublicInbox/IPC.pm b/lib/PublicInbox/IPC.pm
index 592efd21f0f95fd4ddc81d53ce95344302b31b58..838f95306d761eec38a0b9b7393b87947e972c2b 100644 (file)
--- a/lib/PublicInbox/IPC.pm
+++ b/lib/PublicInbox/IPC.pm
@@ -46,11 +46,6 @@ my $send_cmd = PublicInbox::Spawn->can('send_cmd4') // do {
        PublicInbox::CmdIPC4->can('send_cmd4');
 };
 
-sub wq_set_recv_modes {
-       my ($self, @modes) = @_;
-       $self->{-wq_recv_modes} = \@modes;
-}
-
 sub _get_rec ($) {
        my ($r) = @_;
        defined(my $len = <$r>) or return;
@@ -251,15 +246,13 @@ sub _recv_and_run {
        my ($self, $s2, $len, $full_stream) = @_;
        my @fds = $recv_cmd->($s2, my $buf, $len);
        my $n = length($buf // '') or return;
-       my @m = @{$self->{-wq_recv_modes} // [qw( +<&= >&= >&= )]};
        my $nfd = 0;
        for my $fd (@fds) {
-               my $mode = shift(@m);
-               if (open(my $cmdfh, $mode, $fd)) {
+               if (open(my $cmdfh, '+<&=', $fd)) {
                        $self->{$nfd++} = $cmdfh;
                        $cmdfh->autoflush(1);
                } else {
-                       die "$$ open($mode$fd) (FD:$nfd): $!";
+                       die "$$ open(+<&=$fd) (FD:$nfd): $!";
                }
        }
        while ($full_stream && $n < $len) {
@@ -318,14 +311,15 @@ sub wq_do { # always async
        }
 }
 
-sub _wq_worker_start ($$) {
-       my ($self, $oldset) = @_;
+sub _wq_worker_start ($$$) {
+       my ($self, $oldset, $fields) = @_;
        my $seed = rand(0xffffffff);
        my $pid = fork // die "fork: $!";
        if ($pid == 0) {
                srand($seed);
                eval { PublicInbox::DS->Reset };
                delete @$self{qw(-wq_s1 -wq_workers -wq_ppid)};
+               @$self{keys %$fields} = values(%$fields) if $fields;
                $SIG{$_} = 'IGNORE' for (qw(PIPE TTOU TTIN));
                $SIG{$_} = 'DEFAULT' for (qw(TERM QUIT INT CHLD));
                local $0 = $self->{-wq_ident};
@@ -344,7 +338,7 @@ sub _wq_worker_start ($$) {
 
 # starts workqueue workers if Sereal or Storable is installed
 sub wq_workers_start {
-       my ($self, $ident, $nr_workers, $oldset) = @_;
+       my ($self, $ident, $nr_workers, $oldset, $fields) = @_;
        ($enc && $send_cmd && $recv_cmd && defined($SEQPACKET)) or return;
        return if $self->{-wq_s1}; # idempotent
        $self->{-wq_s1} = $self->{-wq_s2} = undef;
@@ -356,18 +350,18 @@ sub wq_workers_start {
        my $sigset = $oldset // PublicInbox::DS::block_signals();
        $self->{-wq_workers} = {};
        $self->{-wq_ident} = $ident;
-       _wq_worker_start($self, $sigset) for (1..$nr_workers);
+       _wq_worker_start($self, $sigset, $fields) for (1..$nr_workers);
        PublicInbox::DS::sig_setmask($sigset) unless $oldset;
        $self->{-wq_ppid} = $$;
 }
 
 sub wq_worker_incr { # SIGTTIN handler
-       my ($self, $oldset) = @_;
+       my ($self, $oldset, $fields) = @_;
        $self->{-wq_s2} or return;
        return if wq_workers($self) >= $WQ_MAX_WORKERS;
        $self->ipc_atfork_prepare;
        my $sigset = $oldset // PublicInbox::DS::block_signals();
-       _wq_worker_start($self, $sigset);
+       _wq_worker_start($self, $sigset, $fields);
        PublicInbox::DS::sig_setmask($sigset) unless $oldset;
 }