* [PATCH 11/9] inbox: reinstate periodic cleanup of Xapian and SQLite objects
@ 2017-01-11 10:21 7% ` Eric Wong
0 siblings, 0 replies; 1+ results
From: Eric Wong @ 2017-01-11 10:21 UTC (permalink / raw)
To: meta
We may need to do this even more aggressively, since the
Xapian database does not always give the latest results.
This time, we'll do it without relying on weak references,
and instead check refcounts.
---
lib/PublicInbox/Inbox.pm | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 51ada0b..a0d69f1 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -7,6 +7,7 @@ use strict;
use warnings;
use PublicInbox::Git;
use PublicInbox::MID qw(mid2path);
+use Devel::Peek qw(SvREFCNT);
my $cleanup_timer;
eval {
@@ -18,10 +19,20 @@ eval {
my $CLEANUP = {}; # string(inbox) -> inbox
sub cleanup_task () {
$cleanup_timer = undef;
- delete $_->{git} for values %$CLEANUP;
+ for my $ibx (values %$CLEANUP) {
+ foreach my $f (qw(git mm search)) {
+ delete $ibx->{$f} if SvREFCNT($ibx->{$f}) == 1;
+ }
+ }
$CLEANUP = {};
}
+sub _cleanup_later ($) {
+ my ($self) = @_;
+ $cleanup_timer ||= PublicInbox::EvCleanup::later(*cleanup_task);
+ $CLEANUP->{"$self"} = $self;
+}
+
sub _set_uint ($$$) {
my ($opts, $field, $default) = @_;
my $val = $opts->{$field};
@@ -70,20 +81,23 @@ sub git {
$self->{git} ||= eval {
my $g = PublicInbox::Git->new($self->{mainrepo});
$g->{-httpbackend_limiter} = $self->{-httpbackend_limiter};
- $cleanup_timer ||= PublicInbox::EvCleanup::later(*cleanup_task);
- $CLEANUP->{"$self"} = $self;
+ _cleanup_later($self);
$g;
};
}
sub mm {
my ($self) = @_;
- $self->{mm} ||= eval { PublicInbox::Msgmap->new($self->{mainrepo}) };
+ $self->{mm} ||= eval {
+ _cleanup_later($self);
+ PublicInbox::Msgmap->new($self->{mainrepo});
+ };
}
sub search {
my ($self) = @_;
$self->{search} ||= eval {
+ _cleanup_later($self);
PublicInbox::Search->new($self->{mainrepo}, $self->{altid});
};
}
--
EW
^ permalink raw reply related [relevance 7%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2017-01-07 1:44 [PATCH 0/9] misc cleanups and trimming Eric Wong
2017-01-07 1:44 ` [PATCH 5/9] inbox: eliminate weaken usage entirely Eric Wong
2017-01-11 10:21 7% ` [PATCH 11/9] inbox: reinstate periodic cleanup of Xapian and SQLite objects 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).