Skip to content

Replace meta-rule full-rescan retry with a dependency-driven work queue #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bigio wants to merge 2 commits into
base: trunk
Choose a base branch
from
Open

Replace meta-rule full-rescan retry with a dependency-driven work queue #32

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b914dee
Replace meta-rule full-rescan retry with a dependency-driven work queue
bigio Jul 21, 2026
cb31833
initialize queue
bigio Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions lib/Mail/SpamAssassin/Plugin/Check.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,9 @@ sub do_meta_tests {
my $mr = $pms->{meta_check_ready};
my $mp = $pms->{meta_pending};
my $md = $pms->{conf}->{meta_dependencies};
my $mdr = $pms->{conf}->{meta_deprules};
my $mt = $pms->{conf}->{meta_tests};
my $h = $pms->{tests_already_hit};
my $retry;

# When finishing, first mark all unrun non-meta rules as finished,
# it will enable the next loop to finish everything properly
Expand All @@ -314,14 +314,31 @@ sub do_meta_tests {
}
}

RULE:
foreach my $rulename ($finish ? keys %$mp : keys %$mr) {
# Work queue of metas worth (re)checking, seeded from meta_check_ready
# (or all pending metas when finishing). Running a meta can make other
# metas newly ready (a meta depending on it); rather than rescanning
# every pending/ready meta again on each such change (as a "goto RULE"
# restart would), push only the specific metas that depend on whatever
# just resolved, via the same meta_deprules reverse-dependency map
# PerMsgStatus::rule_ready() uses.
my @queue = $finish ? keys %$mp : keys %$mr;
my %queued; @queued{@queue} = (1) x @queue;

while (@queue) {
my $rulename = shift @queue;
delete $queued{$rulename};
next if exists $h->{$rulename}; # already resolved

# Meta is not ready if some dependency has not run yet
my $ready = 1;
foreach my $deprule (@{$md->{$rulename}||[]}) {
if (!exists $h->{$deprule}) {
next RULE;
$ready = 0;
last;
}
}
next if !$ready;

# Metasubs look like ($_[1]->{$rulename}||0) ...
my $result = $mt->{$rulename}->($pms, $h);
if ($result) {
Expand All @@ -333,11 +350,15 @@ RULE:
}
delete $mr->{$rulename};
delete $mp->{$rulename};
# Reiterate all metas again, in case some meta depended on us
$retry = 1;
}

goto RULE if $retry--;
# $rulename just resolved (in %$h); queue only the metas that
# specifically depend on it, instead of every pending/ready meta.
foreach my $deprule (keys %{$mdr->{$rulename} || {}}) {
next if $queued{$deprule};
push @queue, $deprule;
$queued{$deprule} = 1;
}
}

delete $pms->{meta_check_ready};
}
Expand Down