[self-profiler] Misc cleanups

This commit is contained in:
Wesley Wiser 2019-02-10 14:22:58 -05:00
parent 8170828cb9
commit e9ebc2e956

View file

@ -69,12 +69,7 @@ impl CategoryResultData {
} }
fn total_time(&self) -> u64 { fn total_time(&self) -> u64 {
let mut total = 0; self.query_times.iter().map(|(_, time)| time).sum()
for (_, time) in &self.query_times {
total += time;
}
total
} }
fn total_cache_data(&self) -> (u64, u64) { fn total_cache_data(&self) -> (u64, u64) {
@ -133,13 +128,7 @@ impl CalculatedResults {
} }
fn total_time(&self) -> u64 { fn total_time(&self) -> u64 {
let mut total = 0; self.categories.iter().map(|(_, data)| data.total_time()).sum()
for (_, data) in &self.categories {
total += data.total_time();
}
total
} }
fn with_options(mut self, opts: &Options) -> CalculatedResults { fn with_options(mut self, opts: &Options) -> CalculatedResults {
@ -411,9 +400,9 @@ impl SelfProfiler {
.unwrap(); .unwrap();
let mut categories: Vec<_> = results.categories.iter().collect(); let mut categories: Vec<_> = results.categories.iter().collect();
categories.sort_by(|(_, data1), (_, data2)| data2.total_time().cmp(&data1.total_time())); categories.sort_by_cached_key(|(_, d)| d.total_time());
for (category, data) in categories { for (category, data) in categories.iter().rev() {
let (category_hits, category_total) = data.total_cache_data(); let (category_hits, category_total) = data.total_cache_data();
let category_hit_percent = calculate_percent(category_hits, category_total); let category_hit_percent = calculate_percent(category_hits, category_total);