~[] to Vec in util/time.rs

This commit is contained in:
Matt Murphy 2014-04-27 17:27:54 -05:00 committed by Ms2ger
parent 428ea04fb5
commit 544bbcde92

View file

@ -63,21 +63,21 @@ impl ProfilerCategory {
// enumeration of all ProfilerCategory types // enumeration of all ProfilerCategory types
fn empty_buckets() -> ProfilerBuckets { fn empty_buckets() -> ProfilerBuckets {
let mut buckets = TreeMap::new(); let mut buckets = TreeMap::new();
buckets.insert(CompositingCategory, ~[]); buckets.insert(CompositingCategory, Vec::new());
buckets.insert(LayoutQueryCategory, ~[]); buckets.insert(LayoutQueryCategory, Vec::new());
buckets.insert(LayoutPerformCategory, ~[]); buckets.insert(LayoutPerformCategory, Vec::new());
buckets.insert(LayoutStyleRecalcCategory, ~[]); buckets.insert(LayoutStyleRecalcCategory, Vec::new());
buckets.insert(LayoutSelectorMatchCategory, ~[]); buckets.insert(LayoutSelectorMatchCategory, Vec::new());
buckets.insert(LayoutTreeBuilderCategory, ~[]); buckets.insert(LayoutTreeBuilderCategory, Vec::new());
buckets.insert(LayoutMainCategory, ~[]); buckets.insert(LayoutMainCategory, Vec::new());
buckets.insert(LayoutParallelWarmupCategory, ~[]); buckets.insert(LayoutParallelWarmupCategory, Vec::new());
buckets.insert(LayoutShapingCategory, ~[]); buckets.insert(LayoutShapingCategory, Vec::new());
buckets.insert(LayoutDamagePropagateCategory, ~[]); buckets.insert(LayoutDamagePropagateCategory, Vec::new());
buckets.insert(LayoutDispListBuildCategory, ~[]); buckets.insert(LayoutDispListBuildCategory, Vec::new());
buckets.insert(GfxRegenAvailableFontsCategory, ~[]); buckets.insert(GfxRegenAvailableFontsCategory, Vec::new());
buckets.insert(RenderingDrawingCategory, ~[]); buckets.insert(RenderingDrawingCategory, Vec::new());
buckets.insert(RenderingPrepBuffCategory, ~[]); buckets.insert(RenderingPrepBuffCategory, Vec::new());
buckets.insert(RenderingCategory, ~[]); buckets.insert(RenderingCategory, Vec::new());
buckets buckets
} }
@ -100,7 +100,7 @@ impl ProfilerCategory {
} }
} }
type ProfilerBuckets = TreeMap<ProfilerCategory, ~[f64]>; type ProfilerBuckets = TreeMap<ProfilerCategory, Vec<f64>>;
// back end of the profiler that handles data aggregation and performance metrics // back end of the profiler that handles data aggregation and performance metrics
pub struct Profiler { pub struct Profiler {
@ -200,7 +200,7 @@ impl Profiler {
if data_len > 0 { if data_len > 0 {
let (mean, median, min, max) = let (mean, median, min, max) =
(data.iter().map(|&x|x).sum() / (data_len as f64), (data.iter().map(|&x|x).sum() / (data_len as f64),
data[data_len / 2], data.get(data_len / 2).clone(),
data.iter().fold(f64::INFINITY, |a, &b| a.min(b)), data.iter().fold(f64::INFINITY, |a, &b| a.min(b)),
data.iter().fold(-f64::INFINITY, |a, &b| a.max(b))); data.iter().fold(-f64::INFINITY, |a, &b| a.max(b)));
println!("{:-35s}: {:15.4f} {:15.4f} {:15.4f} {:15.4f} {:15u}", println!("{:-35s}: {:15.4f} {:15.4f} {:15.4f} {:15.4f} {:15u}",