Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout: Make some slow debug code only execute when RUST_LOG is set appropriately

Browse source
This commit is contained in:
Patrick Walton 2012-10-12 15:27:04 -07:00
parent 561879848c
commit b9e2571a35
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/servo/layout/layout_task.rs
View file

@ -131,7 +131,7 @@ impl Layout {
BuildMsg(node, styles, doc_url, to_content, window_size) => {
debug!("layout: received layout request for: %s", doc_url.to_str());
debug!("layout: parsed Node tree");
//node.dump();
debug!("%?", node.dump());
let screen_size = Size2D(au::from_px(window_size.width as int),
au::from_px(window_size.height as int));
@ -144,7 +144,7 @@ impl Layout {
screen_size: Rect(Point2D(au(0), au(0)), screen_size)
};
do util::time::time(~"layout") {
let layout_root: @FlowContext = do util::time::time("layout: tree construction") {
// TODO: this is dumb. we don't need 3 separate traversals.
node.initialize_style_for_subtree(&layout_ctx, &self.layout_refs);
node.recompute_style_for_subtree(&layout_ctx, &styles);
@ -159,13 +159,19 @@ impl Layout {
};
debug!("layout: constructed Flow tree");
layout_root.dump();
debug!("%?", layout_root.dump());
layout_root
};
do util::time::time("layout: main layout") {
/* perform layout passes over the flow tree */
do layout_root.traverse_postorder |f| { f.bubble_widths(&layout_ctx) }
do layout_root.traverse_preorder |f| { f.assign_widths(&layout_ctx) }
do layout_root.traverse_postorder |f| { f.assign_height(&layout_ctx) }
}
do util::time::time("layout: display list building") {
let dlist = DVec();
let builder = dl::DisplayListBuilder {
ctx: &layout_ctx,
@ -181,7 +187,7 @@ impl Layout {
layout_root.build_display_list(&builder, &copy layout_root.d().position,
&render_layer.display_list);
self.render_task.send(render_task::RenderMsg(move render_layer));
} // time(layout)
} // time(layout: display list building)
} // BuildMsg
} // match

10
src/servo/util/time.rs
View file

@ -1,11 +1,15 @@
// Timing functions.
use std::time::precise_time_ns;
pub fn time(msg: &str, callback: fn()) {
pub fn time<T>(msg: &str, callback: fn() -> T) -> T{
let start_time = precise_time_ns();
callback();
let val = callback();
let end_time = precise_time_ns();
#debug("%s took %u ms", msg, ((end_time - start_time) / 1000000u64) as uint);
let ms = ((end_time - start_time) / 1000000u64) as uint;
if ms >= 5 {
#debug("%s took %u ms", msg, ms);
}
return move val;
}