Skip to content

Commit

Permalink
Stop unconditionally collecting traversal statistics in nightly builds.
Browse files Browse the repository at this point in the history
The current code also makes us panic when DUMP_STYLE_STATISTICS=1 is
set. :-(

MozReview-Commit-ID: JWGMojOnGFK
  • Loading branch information
bholley committed Mar 8, 2018
1 parent b6de056 commit 4a2e1be
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions components/style/driver.rs
Expand Up @@ -42,7 +42,6 @@ where
token.traversal_root().expect("Should've ensured we needed to traverse");

let dump_stats = traversal.shared_context().options.dump_style_statistics;
let is_nightly = traversal.shared_context().options.is_nightly();
let start_time = if dump_stats { Some(time::precise_time_s()) } else { None };

// Declare the main-thread context, as well as the worker-thread contexts,
Expand Down Expand Up @@ -113,8 +112,9 @@ where
nodes_remaining_at_current_depth = discovered.len();
}
}
// Accumulate statistics
if dump_stats || is_nightly {

// dump statistics to stdout if requested
if dump_stats {
let mut aggregate =
mem::replace(&mut context.thread_local.statistics, Default::default());
let parallel = maybe_tls.is_some();
Expand All @@ -128,9 +128,8 @@ where
});
}

// dump to stdout if requested
if dump_stats && aggregate.is_large_traversal() {
aggregate.finish(traversal, parallel, start_time.unwrap());
aggregate.finish(traversal, parallel, start_time.unwrap());
if aggregate.is_large_traversal() {
println!("{}", aggregate);
}
}
Expand Down

0 comments on commit 4a2e1be

Please sign in to comment.