bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix tidy

Browse source
This commit is contained in:
Wesley Wiser 2018-07-20 21:28:37 -04:00
parent 97ab37e2dc
commit 60c2e9a329
1 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/librustc/util/profiling.rs
View file

@ -93,7 +93,8 @@ impl CategoryData {
($name:tt, $rustic_name:ident) => { ($name:tt, $rustic_name:ident) => {
let (hits, total) = self.query_counts.$rustic_name; let (hits, total) = self.query_counts.$rustic_name;
let (hits, total) = if total > 0 { let (hits, total) = if total > 0 {
(format!("{:.2}", (((hits as f32) / (total as f32)) * 100.0)), total.to_string()) (format!("{:.2}",
(((hits as f32) / (total as f32)) * 100.0)), total.to_string())
} else { } else {
("".into(), "".into()) ("".into(), "".into())
}; };
@ -109,8 +110,10 @@ impl CategoryData {
}; };
} }
writeln!(lock, "| Phase | Time (ms) | Queries | Hits (%) |").unwrap(); writeln!(lock, "| Phase | Time (ms) | Queries | Hits (%) |")
writeln!(lock, "| ---------------- | -------------- | -------------- | -------- |").unwrap(); .unwrap();
writeln!(lock, "| ---------------- | -------------- | -------------- | -------- |")
.unwrap();
p!("Parsing", parsing); p!("Parsing", parsing);
p!("Expansion", expansion); p!("Expansion", expansion);
@ -126,7 +129,9 @@ impl CategoryData {
($category:tt, $rustic_name:ident) => {{ ($category:tt, $rustic_name:ident) => {{
let (hits, total) = self.query_counts.$rustic_name; let (hits, total) = self.query_counts.$rustic_name;
format!("{{ \"category\": {}, \"time_ms\": {}, \"query_count\": {}, \"query_hits\": {} }}", format!(
"{{ \"category\": {}, \"time_ms\": {},
\"query_count\": {}, \"query_hits\": {} }}",
stringify!($category), stringify!($category),
self.times.$rustic_name / 1_000_000, self.times.$rustic_name / 1_000_000,
total, total,
@ -209,9 +214,9 @@ impl SelfProfiler {
pub fn end_activity(&mut self, category: ProfileCategory) { pub fn end_activity(&mut self, category: ProfileCategory) {
match self.timer_stack.pop() { match self.timer_stack.pop() {
None => bug!("end_activity() was called but there was no running activity"), None => bug!("end_activity() was called but there was no running activity"),
Some(c) => Some(c) =>
assert!( assert!(
c == category, c == category,
"end_activity() was called but a different activity was running"), "end_activity() was called but a different activity was running"),
} }
@ -223,7 +228,8 @@ impl SelfProfiler {
} }
} }
//the new timer is different than the previous, so record the elapsed time and start a new timer //the new timer is different than the previous,
//so record the elapsed time and start a new timer
let elapsed = self.stop_timer(); let elapsed = self.stop_timer();
let new_time = self.data.times.get(category) + elapsed; let new_time = self.data.times.get(category) + elapsed;
self.data.times.set(category, new_time); self.data.times.set(category, new_time);
@ -240,12 +246,18 @@ impl SelfProfiler {
pub fn print_results(&mut self, opts: &Options) { pub fn print_results(&mut self, opts: &Options) {
self.end_activity(ProfileCategory::Other); self.end_activity(ProfileCategory::Other);
assert!(self.timer_stack.is_empty(), "there were timers running when print_results() was called"); assert!(
self.timer_stack.is_empty(),
"there were timers running when print_results() was called");
let out = io::stdout(); let out = io::stdout();
let mut lock = out.lock(); let mut lock = out.lock();
let crate_name = opts.crate_name.as_ref().map(|n| format!(" for {}", n)).unwrap_or_default(); let crate_name =
opts.crate_name
.as_ref()
.map(|n| format!(" for {}", n))
.unwrap_or_default();
writeln!(lock, "Self profiling results{}:", crate_name).unwrap(); writeln!(lock, "Self profiling results{}:", crate_name).unwrap();
writeln!(lock).unwrap(); writeln!(lock).unwrap();
@ -261,9 +273,10 @@ impl SelfProfiler {
pub fn save_results(&self, opts: &Options) { pub fn save_results(&self, opts: &Options) {
let category_data = self.data.json(); let category_data = self.data.json();
let compilation_options = format!("{{ \"optimization_level\": \"{:?}\", \"incremental\": {} }}", let compilation_options =
opts.optimize, format!("{{ \"optimization_level\": \"{:?}\", \"incremental\": {} }}",
if opts.incremental.is_some() { "true" } else { "false" }); opts.optimize,
if opts.incremental.is_some() { "true" } else { "false" });
let json = format!("{{ \"category_data\": {}, \"compilation_options\": {} }}", let json = format!("{{ \"category_data\": {}, \"compilation_options\": {} }}",
category_data, category_data,