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 B9E251FA13 for ; Wed, 9 Sep 2020 06:26:19 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 06/11] config: split out iterator into separate object Date: Wed, 9 Sep 2020 06:26:13 +0000 Message-Id: <20200909062618.5940-7-e@80x24.org> In-Reply-To: <20200909062618.5940-1-e@80x24.org> References: <20200909062618.5940-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We will need to allow simultaneous iterators on the same config object, since we'll need this for ExtMsg, NNTPD, WwwListing, NewsWWW, and other places. --- MANIFEST | 1 + lib/PublicInbox/Config.pm | 18 ------------------ lib/PublicInbox/ConfigIter.pm | 28 ++++++++++++++++++++++++++++ lib/PublicInbox/IMAPD.pm | 6 ++++-- 4 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 lib/PublicInbox/ConfigIter.pm diff --git a/MANIFEST b/MANIFEST index 0e225b6a..04a3744f 100644 --- a/MANIFEST +++ b/MANIFEST @@ -107,6 +107,7 @@ lib/PublicInbox/AltId.pm lib/PublicInbox/Cgit.pm lib/PublicInbox/CompressNoop.pm lib/PublicInbox/Config.pm +lib/PublicInbox/ConfigIter.pm lib/PublicInbox/ContentHash.pm lib/PublicInbox/DS.pm lib/PublicInbox/DSKQXS.pm diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index f78115b6..8ccf337d 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -99,24 +99,6 @@ sub each_inbox { } } -sub iterate_start { - my ($self, $cb, @arg) = @_; - my $i = 0; - $self->{-iter} = [ \$i, $cb, @arg ]; -} - -# for PublicInbox::DS::next_tick, we only call this is if -# PublicInbox::DS is already loaded -sub event_step { - my ($self) = @_; - my ($i, $cb, @arg) = @{$self->{-iter}}; - my $section = $self->{-section_order}->[$$i++]; - delete($self->{-iter}) unless defined($section); - eval { $cb->($self, $section, @arg) }; - warn "E: $@ in ${self}::event_step" if $@; - PublicInbox::DS::requeue($self) if defined($section); -} - sub lookup_newsgroup { my ($self, $ng) = @_; _lookup_fill($self, '-by_newsgroup', lc($ng)); diff --git a/lib/PublicInbox/ConfigIter.pm b/lib/PublicInbox/ConfigIter.pm new file mode 100644 index 00000000..26cc70e2 --- /dev/null +++ b/lib/PublicInbox/ConfigIter.pm @@ -0,0 +1,28 @@ +# Copyright (C) 2020 all contributors +# License: AGPL-3.0+ + +# Intended for PublicInbox::DS->EventLoop in read-only daemons +# to avoid each_inbox() monopolizing the event loop when hundreds/thousands +# of inboxes are in play. +package PublicInbox::ConfigIter; +use strict; +use v5.10.1; + +sub new { + my ($class, $pi_cfg, $cb, @args) = @_; + my $i = 0; + bless [ $pi_cfg, \$i, $cb, @args ], __PACKAGE__; +} + +# for PublicInbox::DS::next_tick, we only call this is if +# PublicInbox::DS is already loaded +sub event_step { + my $self = shift; + my ($pi_cfg, $i, $cb, @arg) = @$self; + my $section = $pi_cfg->{-section_order}->[$$i++]; + eval { $cb->($pi_cfg, $section, @arg) }; + warn "E: $@ in ${self}::event_step" if $@; + PublicInbox::DS::requeue($self) if defined($section); +} + +1; diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm index 09bedf5c..3c211ee1 100644 --- a/lib/PublicInbox/IMAPD.pm +++ b/lib/PublicInbox/IMAPD.pm @@ -6,6 +6,7 @@ package PublicInbox::IMAPD; use strict; use PublicInbox::Config; +use PublicInbox::ConfigIter; use PublicInbox::InboxIdle; use PublicInbox::IMAP; use PublicInbox::DummyInbox; @@ -98,8 +99,9 @@ sub refresh_groups { my $pi_config = PublicInbox::Config->new; if ($sig) { # SIGHUP is handled through the event loop $self->{imapd_next} = { dummies => {}, mailboxes => {} }; - $pi_config->iterate_start(\&imapd_refresh_step, $self); - PublicInbox::DS::requeue($pi_config); # call event_step + my $iter = PublicInbox::ConfigIter->new($pi_config, + \&imapd_refresh_step, $self); + $iter->event_step; } else { # initial start is synchronous $self->{dummies} = {}; $pi_config->each_inbox(\&imapd_refresh_ibx, $self);