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-ASN: 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 BECF61F5AE for ; Sat, 1 May 2021 06:31:22 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] lei_auth: s/net_merge_complete/net_merge_all_done/ Date: Sat, 1 May 2021 06:31:22 +0000 Message-Id: <20210501063122.10231-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We use the "done" term elsewhere for similar things, and my easily-confused mind equates "complete" with shell completion. --- lib/PublicInbox/LeiAuth.pm | 2 +- lib/PublicInbox/LeiImport.pm | 4 ++-- lib/PublicInbox/LeiTag.pm | 4 ++-- lib/PublicInbox/LeiToMail.pm | 2 +- lib/PublicInbox/LeiXSearch.pm | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/PublicInbox/LeiAuth.pm b/lib/PublicInbox/LeiAuth.pm index e7b26c5f..877ae6a3 100644 --- a/lib/PublicInbox/LeiAuth.pm +++ b/lib/PublicInbox/LeiAuth.pm @@ -27,7 +27,7 @@ sub do_auth_atfork { # used by IPC WQ workers 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) + $wq->net_merge_all_done; # defined per wq-class (e.g. LeiImport) } sub net_merge_all { # called in wq worker via wq_broadcast diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index def121ab..575cf125 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -48,7 +48,7 @@ sub input_net_cb { # imap_each / nntp_each input_eml_cb($self, $eml, $vmd); } -sub net_merge_complete { # callback used by LeiAuth +sub net_merge_all_done { # callback used by LeiAuth my ($self) = @_; $self->wq_io_do('process_inputs'); $self->wq_close(1); @@ -85,7 +85,7 @@ sub lei_import { # the main "lei import" method (my $op_c, $ops) = $lei->workers_start($self, 'lei-import', $j, $ops); $lei->{wq1} = $self; $lei->{-err_type} = 'non-fatal'; - net_merge_complete($self) unless $lei->{auth}; + net_merge_all_done($self) unless $lei->{auth}; $op_c->op_wait_event($ops); } diff --git a/lib/PublicInbox/LeiTag.pm b/lib/PublicInbox/LeiTag.pm index 989a6954..2170e3f2 100644 --- a/lib/PublicInbox/LeiTag.pm +++ b/lib/PublicInbox/LeiTag.pm @@ -19,7 +19,7 @@ sub input_eml_cb { # used by PublicInbox::LeiInput::input_fh sub input_mbox_cb { input_eml_cb($_[1], $_[0]) } -sub net_merge_complete { # callback used by LeiAuth +sub net_merge_all_done { # callback used by LeiAuth my ($self) = @_; $self->wq_io_do('process_inputs'); $self->wq_close(1); @@ -53,7 +53,7 @@ sub lei_tag { # the "lei tag" method (my $op_c, $ops) = $lei->workers_start($self, 'lei-tag', $j, $ops); $lei->{wq1} = $self; $lei->{-err_type} = 'non-fatal'; - net_merge_complete($self) unless $lei->{auth}; + net_merge_all_done($self) unless $lei->{auth}; $op_c->op_wait_event($ops); } diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm index a546ab42..ab4de378 100644 --- a/lib/PublicInbox/LeiToMail.pm +++ b/lib/PublicInbox/LeiToMail.pm @@ -669,7 +669,7 @@ sub wq_atexit_child { } # called in top-level lei-daemon when LeiAuth is done -sub net_merge_complete { +sub net_merge_all_done { my ($self) = @_; $self->wq_broadcast('do_post_auth'); $self->wq_close(1); diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index e04af0dc..d212a732 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -495,7 +495,7 @@ sub do_query { $self->{opt_threads} = $lei->{opt}->{threads}; $self->{opt_sort} = $lei->{opt}->{'sort'}; if ($l2m) { - $l2m->net_merge_complete unless $lei->{auth}; + $l2m->net_merge_all_done unless $lei->{auth}; } else { start_query($self); }