* [PATCH 06/11] config: split out iterator into separate object
2020-09-09 6:26 6% [PATCH 00/11] httpd: further reduce event loop monopolization Eric Wong
@ 2020-09-09 6:26 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-09-09 6:26 UTC (permalink / raw)
To: meta
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 <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+
+# 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);
^ permalink raw reply related [relevance 7%]
* [PATCH 00/11] httpd: further reduce event loop monopolization
@ 2020-09-09 6:26 6% Eric Wong
2020-09-09 6:26 7% ` [PATCH 06/11] config: split out iterator into separate object Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-09-09 6:26 UTC (permalink / raw)
To: meta
A couple more things to mitigate the effects of slow storage
with many inboxes. Mostly solver-related, and still more to
come... (Hoping the electrical grid stays up and dust bunny
removal solved overheating problems).
Eric Wong (11):
xt/solver: test with public-inbox-httpd, too
solver: drop warnings, modernize use v5.10.1, use SEEK_SET
use "\&" where possible when referring to subroutines
www: manifest.js.gz generation no longer hogs event loop
config: flatten each_inbox and iterate_start args
config: split out iterator into separate object
t/cgi.t: show stderr on failures
extmsg: prevent cross-inbox matches from hogging event loop
wwwlisting: avoid hogging event loop
solver: check one git coderepo and inbox at a time
solver: break apart inbox blob retrieval
MANIFEST | 2 +
lib/PublicInbox/Cgit.pm | 5 +-
lib/PublicInbox/Config.pm | 22 +--
lib/PublicInbox/ConfigIter.pm | 40 +++++
lib/PublicInbox/ExtMsg.pm | 102 ++++++++----
lib/PublicInbox/IMAPD.pm | 6 +-
lib/PublicInbox/Inbox.pm | 2 +-
lib/PublicInbox/ManifestJsGz.pm | 135 ++++++++++++++++
lib/PublicInbox/SolverGit.pm | 190 +++++++++++++---------
lib/PublicInbox/TestCommon.pm | 4 +-
lib/PublicInbox/WWW.pm | 21 +--
lib/PublicInbox/Watch.pm | 13 +-
lib/PublicInbox/WwwListing.pm | 279 ++++++++------------------------
t/cgi.t | 2 +-
t/replace.t | 8 +-
t/solver_git.t | 7 +-
t/www_listing.t | 7 +-
xt/msgtime_cmp.t | 2 +-
xt/solver.t | 31 +++-
19 files changed, 499 insertions(+), 379 deletions(-)
create mode 100644 lib/PublicInbox/ConfigIter.pm
create mode 100644 lib/PublicInbox/ManifestJsGz.pm
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-09-09 6:26 6% [PATCH 00/11] httpd: further reduce event loop monopolization Eric Wong
2020-09-09 6:26 7% ` [PATCH 06/11] config: split out iterator into separate object 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).