From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 760381FC0D for ; Mon, 22 Feb 2021 11:23:00 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 10/10] lei_auth: trim and remove leftover worker code Date: Mon, 22 Feb 2021 08:22:59 -0300 Message-Id: <20210222112259.32402-10-e@80x24.org> In-Reply-To: <20210222112259.32402-1-e@80x24.org> References: <20210222112155.32231-1-e@80x24.org> <20210222112259.32402-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: LeiAuth is no longer a separate worker process. Instead, it's used directly by LeiToMail and LeiImport for sharing auth info from the first worker to the rest of the workers, using lei-daemon as a message router. So drop the old code to reduce human cognitive load and interpreter memory overhead. --- lib/PublicInbox/LEI.pm | 2 +- lib/PublicInbox/LeiAuth.pm | 24 +++++------------------- lib/PublicInbox/LeiImport.pm | 2 +- lib/PublicInbox/LeiQuery.pm | 4 ++-- 4 files changed, 9 insertions(+), 23 deletions(-) diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index dd34c668..415a425d 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -324,7 +324,7 @@ my %CONFIG_KEYS = ( 'leistore.dir' => 'top-level storage location', ); -my @WQ_KEYS = qw(lxs l2m imp mrr cnv auth); # internal workers +my @WQ_KEYS = qw(lxs l2m imp mrr cnv); # internal workers # pronounced "exit": x_it(1 << 8) => exit(1); x_it(13) => SIGPIPE sub x_it ($$) { diff --git a/lib/PublicInbox/LeiAuth.pm b/lib/PublicInbox/LeiAuth.pm index b4777114..099bdaca 100644 --- a/lib/PublicInbox/LeiAuth.pm +++ b/lib/PublicInbox/LeiAuth.pm @@ -6,27 +6,16 @@ package PublicInbox::LeiAuth; use strict; use v5.10.1; -use parent qw(PublicInbox::IPC); use PublicInbox::PktOp qw(pkt_do); -sub net_merge { - my ($lei, $net_new) = @_; - if ($lei->{pkt_op_p}) { # from lei_convert worker - pkt_do($lei->{pkt_op_p}, 'net_merge', $net_new); - } else { # single lei-daemon consumer - my $self = $lei->{auth} or return; # client disconnected - my $net = $self->{net}; - %$net = (%$net, %$net_new); - } -} - 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 $net = $lei->{net}; my $mics = $net->imap_common_init($lei); - net_merge($lei, $net); + pkt_do($lei->{pkt_op_p}, 'net_merge', $net) or + die "pkt_do net_merge: $!"; $net->{mics_cached} = $mics; } @@ -36,7 +25,7 @@ sub net_merge_done1 { # bump merge-count in top-level lei-daemon $wq->net_merge_complete; # defined per wq-class (e.g. LeiImport) } -sub net_merge_all { # called via wq_broadcast +sub net_merge_all { # called in wq worker via wq_broadcast my ($wq, $net_new) = @_; my $net = $wq->{lei}->{net}; %$net = (%$net, %$net_new); @@ -56,9 +45,6 @@ sub op_merge { # prepares PktOp->pair ops $ops->{net_merge_done1} = [ \&net_merge_done1, $wq ]; } -sub new { - my ($cls, $net) = @_; # net may be NetReader or descendant (NetWriter) - bless { net => $net }, $cls; -} +sub new { bless \(my $x), __PACKAGE__ } 1; diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index bc37c628..b85f4d6c 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -112,7 +112,7 @@ sub call { # the main "lei import" method $net->{quiet} = $lei->{opt}->{quiet}; $lei->{net} = $net; require PublicInbox::LeiAuth; - $lei->{auth} = PublicInbox::LeiAuth->new($net); + $lei->{auth} = PublicInbox::LeiAuth->new; } import_start($lei); } diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm index 64c9394c..214267ee 100644 --- a/lib/PublicInbox/LeiQuery.pm +++ b/lib/PublicInbox/LeiQuery.pm @@ -13,9 +13,9 @@ sub prep_ext { # externals_each callback sub _start_query { my ($self) = @_; - if (my $net = $self->{net}) { + if ($self->{net}) { require PublicInbox::LeiAuth; - $self->{auth} = PublicInbox::LeiAuth->new($net); + $self->{auth} = PublicInbox::LeiAuth->new } $self->{lxs}->do_query($self); }