Skip to content

Commit 2cecafe

Browse files
committed
don't count file memory in memory benchmark
1 parent c8e0ffb commit 2cecafe

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

benches/bench_memory.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,10 @@ fn bench_memory_usage(c: &mut Criterion) {
149149
ALLOCATOR.reset();
150150
let rules = rules_from_lists(&["data/brave/brave-main-list.txt"]);
151151
let mut engine = Engine::from_rules(rules, Default::default());
152-
let resource_json =
152+
let mut resource_json =
153153
std::fs::read_to_string("data/brave/brave-resources.json").unwrap();
154-
let resource_list: Vec<Resource> = serde_json::from_str(&resource_json).unwrap();
154+
let resource_list: Vec<Resource> =
155+
serde_json::from_str(&std::mem::take(&mut resource_json)).unwrap();
155156
engine.use_resources(resource_list);
156157

157158
if run_requests {

js/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ fn engine_url_cosmetic_resources(mut cx: FunctionContext) -> JsResult<JsValue> {
248248
fn engine_serialize(mut cx: FunctionContext) -> JsResult<JsArrayBuffer> {
249249
let this = cx.argument::<JsBox<Engine>>(0)?;
250250
let serialized = if let Ok(engine) = this.0.lock() {
251-
engine.serialize().unwrap()
251+
engine.serialize().to_vec()
252252
} else {
253253
cx.throw_error("Failed to acquire lock on engine")?
254254
};

tests/unit/engine.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,10 @@ mod tests {
218218
let mut engine = Engine::from_rules_parametrised(rules, Default::default(), false, true);
219219
let data = engine.serialize().to_vec();
220220

221-
let expected_hash = if cfg!(feature = "css-validation") {
222-
4841091867167548148u64
221+
let expected_hash: u64 = if cfg!(feature = "css-validation") {
222+
15878451394701322592
223223
} else {
224-
9391295892290689321u64
224+
1052691436141678847
225225
};
226226

227227
assert_eq!(hash(&data), expected_hash, "{}", HASH_MISMATCH_MSG);

0 commit comments

Comments
 (0)