about summary refs log tree commit homepage
path: root/lib/PublicInbox/LeiAuth.pm
diff options
context:
space:
mode:
Diffstat (limited to 'lib/PublicInbox/LeiAuth.pm')
-rw-r--r--lib/PublicInbox/LeiAuth.pm37
1 files changed, 36 insertions, 1 deletions
diff --git a/lib/PublicInbox/LeiAuth.pm b/lib/PublicInbox/LeiAuth.pm
index 5d321be2..d329eadb 100644
--- a/lib/PublicInbox/LeiAuth.pm
+++ b/lib/PublicInbox/LeiAuth.pm
@@ -8,7 +8,6 @@ use strict;
 use v5.10.1;
 use parent qw(PublicInbox::IPC);
 use PublicInbox::PktOp qw(pkt_do);
-use PublicInbox::NetReader;
 
 sub net_merge {
         my ($lei, $net_new) = @_;
@@ -28,6 +27,42 @@ sub do_auth { # called via wq_io_do
         net_merge($lei, $net); # tell lei-daemon updated auth info
 }
 
+sub do_auth_atfork { # used by IPC WQ workers
+        my ($self, $wq) = @_;
+        return if $wq->{-wq_worker_nr} != 0;
+        my $lei = $wq->{lei};
+        my $net = $self->{net};
+        my $mics = $net->imap_common_init($lei);
+        net_merge($lei, $net);
+        $net->{mics_cached} = $mics;
+}
+
+sub net_merge_done1 { # bump merge-count in top-level lei-daemon
+        my ($wq) = @_;
+        return if ++$wq->{nr_net_merge_done} != $wq->{-wq_nr_workers};
+        $wq->net_merge_complete; # defined per wq-class (e.g. LeiImport)
+}
+
+sub net_merge_all { # called via wq_broadcast
+        my ($wq, $net_new) = @_;
+        my $net = $wq->{lei}->{net};
+        %$net = (%$net, %$net_new);
+        pkt_do($wq->{lei}->{pkt_op_p}, 'net_merge_done1') or
+                die "pkt_op_do net_merge_done1: $!";
+}
+
+# called by top-level lei-daemon when first worker is done with auth
+sub net_merge_continue {
+        my ($wq, $net_new) = @_;
+        $wq->wq_broadcast('net_merge_all', $net_new);
+}
+
+sub op_merge { # prepares PktOp->pair ops
+        my ($self, $ops, $wq) = @_;
+        $ops->{net_merge} = [ \&net_merge_continue, $wq ];
+        $ops->{net_merge_done1} = [ \&net_merge_done1, $wq ];
+}
+
 sub do_finish_auth { # dwaitpid callback
         my ($arg, $pid) = @_;
         my ($self, $lei, $post_auth_cb, @args) = @$arg;