* [PATCH 0/3] lei_auth: document and simplify
@ 2021-09-06 12:58 7% Eric Wong
2021-09-06 12:58 6% ` [PATCH 2/3] lei_auth: remove net_merge_done1 step Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-09-06 12:58 UTC (permalink / raw)
To: meta
Some clarity ahead of planned IMAP improvements for "lei up"
and keyword propagation from lei/store => IMAP folders.
Eric Wong (3):
lei_auth: diagram for current behavior
lei_auth: remove net_merge_done1 step
lei_auth: simplify users
lib/PublicInbox/LeiAuth.pm | 36 +++++++++++++++++++----------
lib/PublicInbox/LeiExportKw.pm | 3 ---
lib/PublicInbox/LeiImport.pm | 2 --
lib/PublicInbox/LeiIndex.pm | 2 --
lib/PublicInbox/LeiLsMailSource.pm | 1 -
lib/PublicInbox/LeiPruneMailSync.pm | 1 -
lib/PublicInbox/LeiRediff.pm | 1 -
lib/PublicInbox/LeiRm.pm | 1 -
lib/PublicInbox/LeiTag.pm | 1 -
lib/PublicInbox/LeiToMail.pm | 2 --
10 files changed, 24 insertions(+), 26 deletions(-)
^ permalink raw reply [relevance 7%]
* [PATCH 2/3] lei_auth: remove net_merge_done1 step
2021-09-06 12:58 7% [PATCH 0/3] lei_auth: document and simplify Eric Wong
@ 2021-09-06 12:58 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-09-06 12:58 UTC (permalink / raw)
To: meta
It turns out this step is unnecessary, since SOCK_SEQPACKET
ordering is guaranteed and we know wq_broadcast calls will
always be handled sequentially.
---
lib/PublicInbox/LeiAuth.pm | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/lib/PublicInbox/LeiAuth.pm b/lib/PublicInbox/LeiAuth.pm
index 3155d79b..73c0be59 100644
--- a/lib/PublicInbox/LeiAuth.pm
+++ b/lib/PublicInbox/LeiAuth.pm
@@ -20,12 +20,7 @@
# broadcast net_merge_all [ all workers (including LeiAuth worker #0) ]
# [ LeiAuth worker #0 becomes just another WQ worker ]
# |
-# | each worker sends net_merge_done1 to lei-daemon
-# | | | ... |
-# | v v v
-# recv net_merge_done1 <--<-------<------/--/--<--/
-#
-# call net_merge_all_done ->-> do per-class defined actions
+# call net_merge_all_done ->-> do per-WQ-class defined actions
package PublicInbox::LeiAuth;
use strict;
use v5.10.1;
@@ -47,31 +42,22 @@ sub do_auth_atfork { # used by IPC WQ workers
$lei->fail($@) if $@;
}
-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_all_done; # defined per wq-class (e.g. LeiImport)
-}
-
sub net_merge_all { # called in wq worker via wq_broadcast
my ($wq, $net_new) = @_;
my $net = $wq->{lei}->{net};
%$net = (%$net, %$net_new);
- # notify daemon we're ready
- $wq->{lei}->{pkt_op_p}->pkt_do('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); # pass to current workers
+ $wq->net_merge_all_done; # defined per-WQ
}
sub op_merge { # prepares PktOp->pair ops
my ($self, $ops, $wq) = @_;
$ops->{net_merge_continue} = [ \&net_merge_continue, $wq ];
- $ops->{net_merge_done1} = [ \&net_merge_done1, $wq ];
}
sub new { bless \(my $x), __PACKAGE__ }
^ permalink raw reply related [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-09-06 12:58 7% [PATCH 0/3] lei_auth: document and simplify Eric Wong
2021-09-06 12:58 6% ` [PATCH 2/3] lei_auth: remove net_merge_done1 step Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).