Skip to content

Commit 26b388a

Browse files
committed
don't count file memory in memory benchmark (#506)
1 parent cef6094 commit 26b388a

File tree

15 files changed

+1346
-121
lines changed

15 files changed

+1346
-121
lines changed

benches/bench_memory.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ fn bench_memory_usage(c: &mut Criterion) {
152152
let resource_json =
153153
std::fs::read_to_string("data/brave/brave-resources.json").unwrap();
154154
let resource_list: Vec<Resource> = serde_json::from_str(&resource_json).unwrap();
155+
std::mem::drop(resource_json);
155156
engine.use_resources(resource_list);
156157

157158
if run_requests {

src/blocker.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -440,11 +440,9 @@ impl Blocker {
440440
network_filters: Vec<crate::filters::network::NetworkFilter>,
441441
options: &BlockerOptions,
442442
) -> Self {
443-
use crate::filters::fb_builder::FlatBufferBuilder;
444-
use crate::filters::fb_network::FilterDataContext;
443+
use crate::filters::{fb_builder::make_flatbuffer, fb_network::FilterDataContext};
445444

446-
let memory =
447-
FlatBufferBuilder::make_flatbuffer(network_filters, options.enable_optimizations);
445+
let memory = make_flatbuffer(network_filters, options.enable_optimizations);
448446
let filter_data_context = FilterDataContext::new(memory);
449447
Self::from_context(filter_data_context)
450448
}

src/engine.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::blocker::{Blocker, BlockerResult};
44
use crate::cosmetic_filter_cache::{CosmeticFilterCache, UrlSpecificResources};
5-
use crate::filters::fb_builder::FlatBufferBuilder;
5+
use crate::filters::fb_builder::make_flatbuffer;
66
use crate::filters::fb_network::{FilterDataContext, FilterDataContextRef};
77
use crate::lists::{FilterSet, ParseOptions};
88
use crate::regex_manager::RegexManagerDiscardPolicy;
@@ -103,7 +103,7 @@ impl Engine {
103103
..
104104
} = set;
105105

106-
let memory = FlatBufferBuilder::make_flatbuffer(network_filters, optimize);
106+
let memory = make_flatbuffer(network_filters, optimize);
107107

108108
let filter_data_context = FilterDataContext::new(memory);
109109

0 commit comments

Comments
 (0)