diff options
Diffstat (limited to 'lib/PublicInbox/Inbox.pm')
| -rw-r--r-- | lib/PublicInbox/Inbox.pm | 52 |
1 files changed, 16 insertions, 36 deletions
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm index cb98d2ad..dd689221 100644 --- a/lib/PublicInbox/Inbox.pm +++ b/lib/PublicInbox/Inbox.pm @@ -10,32 +10,22 @@ use PublicInbox::MID qw(mid2path); use PublicInbox::Eml; use List::Util qw(max); use Carp qw(croak); +use PublicInbox::Compat qw(uniqstr); -# returns true if further checking is required +# in case DBs get replaced (Xapcmd does it for v1) sub check_inodes ($) { for (qw(over mm)) { $_[0]->{$_}->check_inodes if $_[0]->{$_} } } +# search/over/mm hold onto FDs and description+cloneurl may get updated. +# creating long-lived allocations in the same phase as short-lived +# allocations also leads to fragmentation, so we don't want some stuff +# living too long. sub do_cleanup { my ($ibx) = @_; - my $live; - if (defined $ibx->{git}) { - $live = $ibx->isa(__PACKAGE__) ? $ibx->{git}->cleanup(1) - : $ibx->{git}->cleanup_if_unlinked; - delete($ibx->{git}) unless $live; - } - if ($live) { - check_inodes($ibx); - } else { - delete(@$ibx{qw(over mm description cloneurl - -imap_url -nntp_url -pop3_url)}); - } - my $srch = $ibx->{search} // $ibx; + my ($srch) = delete @$ibx{qw(search over mm description cloneurl)}; + $srch //= $ibx; # extsearch delete @$srch{qw(xdb qp)}; - for my $git (@{$ibx->{-repo_objs} // []}) { - $live = 1 if $git->cleanup(1); - } - PublicInbox::DS::add_uniq_timer($ibx+0, 5, \&do_cleanup, $ibx) if $live; } sub _cleanup_later ($) { @@ -54,8 +44,8 @@ sub _set_limiter ($$$) { my $val = $self->{$mkey} or return; my $lim; if ($val =~ /\A[0-9]+\z/) { - require PublicInbox::Qspawn; - $lim = PublicInbox::Qspawn::Limiter->new($val); + require PublicInbox::Limiter; + $lim = PublicInbox::Limiter->new($val); } elsif ($val =~ /\A[a-z][a-z0-9]*\z/) { $lim = $pi_cfg->limiter($val); warn "$mkey limiter=$val not found\n" if !$lim; @@ -80,12 +70,8 @@ sub new { delete $opts->{feedmax}; } # allow any combination of multi-line or comma-delimited hide entries - my $hide = {}; - if (defined(my $h = $opts->{hide})) { - foreach my $v (@$h) { - $hide->{$_} = 1 foreach (split(/\s*,\s*/, $v)); - } - $opts->{-hide} = $hide; + for $v (@{delete($opts->{hide}) // []}) { + $opts->{-'hide_'.$_} = 1 for split(/\s*,\s*/, $v); } bless $opts, $class; } @@ -115,7 +101,6 @@ sub git { my $g = PublicInbox::Git->new($git_dir); my $lim = $self->{-httpbackend_limiter}; $g->{-httpbackend_limiter} = $lim if $lim; - _cleanup_later($self); $g; }; } @@ -192,7 +177,7 @@ sub cloneurl { my ($self) = @_; $self->{cloneurl} // do { my @urls = split(/\s+/s, - PublicInbox::Git::try_cat("$self->{inboxdir}/cloneurl")); + PublicInbox::IO::try_cat "$self->{inboxdir}/cloneurl"); scalar(@urls) ? ($self->{cloneurl} = \@urls) : undef; } // []; } @@ -250,11 +235,7 @@ EOM # nntp://news.example.com/alt.example push @m, $u; } - - # List::Util::uniq requires Perl 5.26+, maybe we - # can use it by 2030 or so - my %seen; - @urls = grep { !$seen{$_}++ } (@urls, @m); + @urls = uniqstr @urls, @m; } \@urls; } @@ -274,8 +255,7 @@ sub pop3_url { @urls = map { m!\Apop3?s?://! ? $_ : "pop3://$_" } @$ps; if (my $mi = $self->{'pop3mirror'}) { my @m = map { m!\Apop3?s?://! ? $_ : "pop3://$_" } @$mi; - my %seen; # List::Util::uniq requires Perl 5.26+ - @urls = grep { !$seen{$_}++ } (@urls, @m); + @urls = uniqstr @urls, @m; } my $n = 0; for (@urls) { $n += s!/+\z!! } @@ -378,7 +358,7 @@ sub unsubscribe_unlock { # called by inotify sub on_unlock { my ($self) = @_; - check_inodes($self); + check_inodes($self); # DB files may be replaced while holding lock my $subs = $self->{unlock_subs} or return; for my $obj (values %$subs) { eval { $obj->on_inbox_unlock($self) }; |