* [PATCH 5/9] inbox: eliminate weaken usage entirely
2017-01-07 1:44 7% [PATCH 0/9] misc cleanups and trimming Eric Wong
@ 2017-01-07 1:44 5% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2017-01-07 1:44 UTC (permalink / raw)
To: meta
We can do a better job initializing the data structure
so we no longer need to rely on weak references to cleanup
when we ditch the config on reload.
---
lib/PublicInbox/Inbox.pm | 69 ++++++++++++++++++++----------------------------
t/config.t | 19 +++++++++++--
t/config_limiter.t | 9 +++----
3 files changed, 50 insertions(+), 47 deletions(-)
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 008a6cf..f77944f 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -5,28 +5,27 @@
package PublicInbox::Inbox;
use strict;
use warnings;
-use Scalar::Util qw(weaken isweak);
use PublicInbox::Git;
use PublicInbox::MID qw(mid2path);
-my $weakt;
+my $cleanup_timer;
eval {
- $weakt = 'disabled';
+ $cleanup_timer = 'disabled';
require PublicInbox::EvCleanup;
- $weakt = undef; # OK if we get here
+ $cleanup_timer = undef; # OK if we get here
};
-my $WEAKEN = {}; # string(inbox) -> inbox
-sub weaken_task () {
- $weakt = undef;
- _weaken_fields($_) for values %$WEAKEN;
- $WEAKEN = {};
+my $CLEANUP = {}; # string(inbox) -> inbox
+sub cleanup_task () {
+ $cleanup_timer = undef;
+ delete $_->{git} for values %$CLEANUP;
+ $CLEANUP = {};
}
-sub _weaken_later ($) {
+sub _cleanup_later ($) {
my ($self) = @_;
- $weakt ||= PublicInbox::EvCleanup::later(*weaken_task);
- $WEAKEN->{"$self"} = $self;
+ $cleanup_timer ||= PublicInbox::EvCleanup::later(*cleanup_task);
+ $CLEANUP->{"$self"} = $self;
}
sub _set_uint ($$$) {
@@ -39,27 +38,10 @@ sub _set_uint ($$$) {
$opts->{$field} = $val || $default;
}
-sub new {
- my ($class, $opts) = @_;
- my $v = $opts->{address} ||= 'public-inbox@example.com';
- my $p = $opts->{-primary_address} = ref($v) eq 'ARRAY' ? $v->[0] : $v;
- $opts->{domain} = ($p =~ /\@(\S+)\z/) ? $1 : 'localhost';
- _set_uint($opts, 'feedmax', 25);
- weaken($opts->{-pi_config});
- bless $opts, $class;
-}
-
-sub _weaken_fields {
- my ($self) = @_;
- foreach my $f (qw(git mm search)) {
- isweak($self->{$f}) or weaken($self->{$f});
- }
-}
-
sub _set_limiter ($$$) {
- my ($self, $git, $pfx) = @_;
+ my ($self, $pi_config, $pfx) = @_;
my $lkey = "-${pfx}_limiter";
- $git->{$lkey} = $self->{$lkey} ||= eval {
+ $self->{$lkey} ||= eval {
# full key is: publicinbox.$NAME.httpbackendmax
my $mkey = $pfx.'max';
my $val = $self->{$mkey} or return;
@@ -68,7 +50,7 @@ sub _set_limiter ($$$) {
require PublicInbox::Qspawn;
$lim = PublicInbox::Qspawn::Limiter->new($val);
} elsif ($val =~ /\A[a-z][a-z0-9]*\z/) {
- $lim = $self->{-pi_config}->limiter($val);
+ $lim = $pi_config->limiter($val);
warn "$mkey limiter=$val not found\n" if !$lim;
} else {
warn "$mkey limiter=$val not understood\n";
@@ -77,28 +59,35 @@ sub _set_limiter ($$$) {
}
}
+sub new {
+ my ($class, $opts) = @_;
+ my $v = $opts->{address} ||= 'public-inbox@example.com';
+ my $p = $opts->{-primary_address} = ref($v) eq 'ARRAY' ? $v->[0] : $v;
+ $opts->{domain} = ($p =~ /\@(\S+)\z/) ? $1 : 'localhost';
+ my $pi_config = delete $opts->{-pi_config};
+ _set_limiter($opts, $pi_config, 'httpbackend');
+ _set_uint($opts, 'feedmax', 25);
+ $opts->{nntpserver} ||= $pi_config->{'publicinbox.nntpserver'};
+ bless $opts, $class;
+}
+
sub git {
my ($self) = @_;
$self->{git} ||= eval {
- _weaken_later($self);
my $g = PublicInbox::Git->new($self->{mainrepo});
- _set_limiter($self, $g, 'httpbackend');
+ $g->{-httpbackend_limiter} = $self->{-httpbackend_limiter};
$g;
};
}
sub mm {
my ($self) = @_;
- $self->{mm} ||= eval {
- _weaken_later($self);
- PublicInbox::Msgmap->new($self->{mainrepo});
- };
+ $self->{mm} ||= eval { PublicInbox::Msgmap->new($self->{mainrepo}) };
}
sub search {
my ($self) = @_;
$self->{search} ||= eval {
- _weaken_later($self);
PublicInbox::Search->new($self->{mainrepo}, $self->{altid});
};
}
@@ -164,7 +153,7 @@ sub nntp_url {
$self->{-nntp_url} ||= do {
# no checking for nntp_usable here, we can point entirely
# to non-local servers or users run by a different user
- my $ns = $self->{-pi_config}->{'publicinbox.nntpserver'};
+ my $ns = $self->{nntpserver};
my $group = $self->{newsgroup};
my @urls;
if ($ns && $group) {
diff --git a/t/config.t b/t/config.t
index 7271351..040e9fb 100644
--- a/t/config.t
+++ b/t/config.t
@@ -31,7 +31,8 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-primary_address => 'meta@public-inbox.org',
'name' => 'meta',
feedmax => 25,
- -pi_config => $cfg,
+ -httpbackend_limiter => undef,
+ nntpserver => undef,
}, "lookup matches expected output");
is($cfg->lookup('blah@example.com'), undef,
@@ -48,7 +49,8 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
'name' => 'test',
feedmax => 25,
'url' => 'http://example.com/test',
- -pi_config => $cfg,
+ -httpbackend_limiter => undef,
+ nntpserver => undef,
}, "lookup matches expected output for test");
}
@@ -65,4 +67,17 @@ my $tmpdir = tempdir('pi-config-XXXXXX', TMPDIR => 1, CLEANUP => 1);
is_deeply($ibx->{altid}, [ @altid ]);
}
+{
+ my $pfx = "publicinbox.test";
+ my %h = (
+ "$pfx.address" => 'test@example.com',
+ "$pfx.mainrepo" => '/path/to/non/existent',
+ "publicinbox.nntpserver" => 'news.example.com',
+ );
+ my %tmp = %h;
+ my $cfg = PublicInbox::Config->new(\%tmp);
+ my $ibx = $cfg->lookup_name('test');
+ is($ibx->{nntpserver}, 'news.example.com', 'global NNTP server');
+}
+
done_testing();
diff --git a/t/config_limiter.t b/t/config_limiter.t
index 486bfbe..f0b6528 100644
--- a/t/config_limiter.t
+++ b/t/config_limiter.t
@@ -37,12 +37,11 @@ my $cfgpfx = "publicinbox.test";
my $lim = $git->{-httpbackend_limiter};
ok($lim, 'Limiter exists');
is($lim->{max}, 3, 'limiter has expected slots');
- $git = undef;
$ibx->{git} = undef;
- PublicInbox::Inbox::weaken_task;
- $git = $ibx->git;
- isnt($old, "$git", 'got new Git object');
- is("$git->{-httpbackend_limiter}", "$lim", 'same limiter');
+ PublicInbox::Inbox::cleanup_task;
+ my $new = $ibx->git;
+ isnt($old, "$new", 'got new Git object');
+ is("$new->{-httpbackend_limiter}", "$lim", 'same limiter');
is($lim->{max}, 3, 'limiter has expected slots');
}
--
EW
^ permalink raw reply related [relevance 5%]
* [PATCH 0/9] misc cleanups and trimming
@ 2017-01-07 1:44 7% Eric Wong
2017-01-07 1:44 5% ` [PATCH 5/9] inbox: eliminate weaken usage entirely Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2017-01-07 1:44 UTC (permalink / raw)
To: meta
Weak reference dependencies are entirely gone. This should
simplify the internal object structures of Perl a bit and
hopefully make the data structures easier to reason about.
While we're at it, there's several search-related cleanups
to eliminate some dead code.
9 changes:
qspawn: prepare to support runtime reloading of Limiter
config: always use namespaced "publicinboxlimiter"
config: remove unused get() method
inbox: describe the full key name
inbox: eliminate weaken usage entirely
config: allow per-inbox nntpserver
remove incorrect comment about strftime + locales
searchmsg: favor direct hash access over accessor methods
search: remove subject_summary
lib/PublicInbox/Config.pm | 14 ++------
lib/PublicInbox/Inbox.pm | 73 ++++++++++++++++++----------------------
lib/PublicInbox/Qspawn.pm | 11 ++++--
lib/PublicInbox/Search.pm | 29 ++--------------
lib/PublicInbox/SearchIdx.pm | 4 +--
lib/PublicInbox/SearchMsg.pm | 36 +++-----------------
lib/PublicInbox/WwwAtomStream.pm | 1 -
t/config.t | 25 ++++++++++++--
t/config_limiter.t | 11 +++---
t/search.t | 17 ----------
10 files changed, 78 insertions(+), 143 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2017-01-07 1:44 7% [PATCH 0/9] misc cleanups and trimming Eric Wong
2017-01-07 1:44 5% ` [PATCH 5/9] inbox: eliminate weaken usage entirely 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).