Skip to content

[Perf] Speedup badfilter processing #564

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

Draft
atuchin-m wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[Perf] Speedup badfilter processing #564

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5037ff9
deprecated NetworkFilter::get_id()
atuchin-m Nov 12, 2025
8ece8d0
Use a hasher for compute_filter_id
atuchin-m Nov 12, 2025
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
2 changes: 1 addition & 1 deletion src/filters/fb_network_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ impl NetworkRulesBuilder {

for filter in network_filters.into_iter() {
// skip any bad filters
let filter_id = filter.get_id();
let filter_id = filter.get_id_without_badfilter();
if badfilter_ids.contains(&filter_id) || filter.is_badfilter() {
continue;
}
Expand Down
11 changes: 5 additions & 6 deletions src/filters/network.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,22 +860,21 @@ impl NetworkFilter {
}

pub fn get_id_without_badfilter(&self) -> Hash {
let mut mask = self.mask;
mask.set(NetworkFilterMask::BAD_FILTER, false);
compute_filter_id(
self.modifier_option.as_deref(),
mask,
self.mask.bits() & !NetworkFilterMask::BAD_FILTER.bits(),
self.filter.string_view().as_deref(),
self.hostname.as_deref(),
self.opt_domains.as_ref(),
self.opt_not_domains.as_ref(),
)
}

#[deprecated(since = "0.11.2", note = "use get_id_without_badfilter instead")]
pub fn get_id(&self) -> Hash {
compute_filter_id(
self.modifier_option.as_deref(),
self.mask,
self.mask.bits(),
self.filter.string_view().as_deref(),
self.hostname.as_deref(),
self.opt_domains.as_ref(),
Expand Down Expand Up @@ -1023,13 +1022,13 @@ impl NetworkMatchable for NetworkFilter {

fn compute_filter_id(
modifier_option: Option<&str>,
mask: NetworkFilterMask,
mask: u32,
filter: Option<&str>,
hostname: Option<&str>,
opt_domains: Option<&Vec<Hash>>,
opt_not_domains: Option<&Vec<Hash>>,
) -> Hash {
let mut hash: Hash = (5408 * 33) ^ Hash::from(mask.bits());
let mut hash: Hash = (5408 * 33) ^ Hash::from(mask);

if let Some(s) = modifier_option {
let chars = s.chars();
Expand Down
3 changes: 2 additions & 1 deletion src/lists.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,8 @@ impl FilterSet {

self.network_filters.into_iter().for_each(|filter| {
// Don't process bad filter rules or matching bad filter rules.
if bad_filter_ids.contains(&filter.get_id()) || filter.is_badfilter() {
if bad_filter_ids.contains(&filter.get_id_without_badfilter()) || filter.is_badfilter()
{
return;
}
let original_rule = *filter
Expand Down