Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-20 23:28:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove PaddedUnsafeFlow.

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2014-06-08 00:12:02 +09:00
parent e98b03f581
commit fa40352fb7
3 changed files with 32 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/main/layout/layout_task.rs
View file

@ -16,7 +16,7 @@ use layout::flow::{PreorderFlowTraversal, PostorderFlowTraversal};
use layout::flow; use layout::flow;
use layout::flow_ref::FlowRef; use layout::flow_ref::FlowRef;
use layout::incremental::RestyleDamage; use layout::incremental::RestyleDamage;
use layout::parallel::PaddedUnsafeFlow; use layout::parallel::UnsafeFlow;
use layout::parallel; use layout::parallel;
use layout::util::{LayoutDataAccess, LayoutDataWrapper, OpaqueNodeMethods, ToGfxColor}; use layout::util::{LayoutDataAccess, LayoutDataWrapper, OpaqueNodeMethods, ToGfxColor};
use layout::wrapper::{LayoutNode, TLayoutNode, ThreadSafeLayoutNode}; use layout::wrapper::{LayoutNode, TLayoutNode, ThreadSafeLayoutNode};
@ -97,7 +97,7 @@ pub struct LayoutTask {
pub stylist: Box<Stylist>, pub stylist: Box<Stylist>,
/// The workers that we use for parallel operation. /// The workers that we use for parallel operation.
pub parallel_traversal: Option<WorkQueue<*mut LayoutContext,PaddedUnsafeFlow>>, pub parallel_traversal: Option<WorkQueue<*mut LayoutContext,UnsafeFlow>>,
/// The channel on which messages can be sent to the profiler. /// The channel on which messages can be sent to the profiler.
pub profiler_chan: ProfilerChan, pub profiler_chan: ProfilerChan,

81
src/components/main/layout/parallel.rs
View file

@ -31,29 +31,7 @@ use style::{Stylist, TNode};
#[allow(dead_code)] #[allow(dead_code)]
fn static_assertion(node: UnsafeLayoutNode) { fn static_assertion(node: UnsafeLayoutNode) {
unsafe { unsafe {
let _: PaddedUnsafeFlow = ::std::intrinsics::transmute(node); let _: UnsafeFlow = ::std::intrinsics::transmute(node);
}
}
/// Memory representation that is at least as large as UnsafeLayoutNode, as it must be
/// safely transmutable to and from that type to accommodate the type-unsafe parallel work
/// queue usage that stores both flows and nodes.
pub type PaddedUnsafeFlow = (uint, uint);
trait UnsafeFlowConversions {
fn to_flow(&self) -> UnsafeFlow;
fn from_flow(flow: &UnsafeFlow) -> Self;
}
impl UnsafeFlowConversions for PaddedUnsafeFlow {
fn to_flow(&self) -> UnsafeFlow {
let (vtable, ptr) = *self;
(vtable, ptr)
}
fn from_flow(flow: &UnsafeFlow) -> PaddedUnsafeFlow {
let &(vtable, ptr) = flow;
(vtable, ptr)
} }
} }
@ -138,7 +116,7 @@ trait ParallelPostorderFlowTraversal : PostorderFlowTraversal {
/// fetch-and-subtract the parent's children count. /// fetch-and-subtract the parent's children count.
fn run_parallel(&mut self, fn run_parallel(&mut self,
mut unsafe_flow: UnsafeFlow, mut unsafe_flow: UnsafeFlow,
_: &mut WorkerProxy<*mut LayoutContext,PaddedUnsafeFlow>) { _: &mut WorkerProxy<*mut LayoutContext,UnsafeFlow>) {
loop { loop {
unsafe { unsafe {
// Get a real flow. // Get a real flow.
@ -182,18 +160,18 @@ trait ParallelPostorderFlowTraversal : PostorderFlowTraversal {
trait ParallelPreorderFlowTraversal : PreorderFlowTraversal { trait ParallelPreorderFlowTraversal : PreorderFlowTraversal {
fn run_parallel(&mut self, fn run_parallel(&mut self,
unsafe_flow: UnsafeFlow, unsafe_flow: UnsafeFlow,
proxy: &mut WorkerProxy<*mut LayoutContext,PaddedUnsafeFlow>); proxy: &mut WorkerProxy<*mut LayoutContext,UnsafeFlow>);
#[inline(always)] #[inline(always)]
fn run_parallel_helper(&mut self, fn run_parallel_helper(&mut self,
unsafe_flow: UnsafeFlow, unsafe_flow: UnsafeFlow,
proxy: &mut WorkerProxy<*mut LayoutContext,PaddedUnsafeFlow>, proxy: &mut WorkerProxy<*mut LayoutContext,UnsafeFlow>,
top_down_func: extern "Rust" fn(PaddedUnsafeFlow, top_down_func: extern "Rust" fn(UnsafeFlow,
&mut WorkerProxy<*mut LayoutContext, &mut WorkerProxy<*mut LayoutContext,
PaddedUnsafeFlow>), UnsafeFlow>),
bottom_up_func: extern "Rust" fn(PaddedUnsafeFlow, bottom_up_func: extern "Rust" fn(UnsafeFlow,
&mut WorkerProxy<*mut LayoutContext, &mut WorkerProxy<*mut LayoutContext,
PaddedUnsafeFlow>)) { UnsafeFlow>)) {
let mut had_children = false; let mut had_children = false;
unsafe { unsafe {
// Get a real flow. // Get a real flow.
@ -207,7 +185,7 @@ trait ParallelPreorderFlowTraversal : PreorderFlowTraversal {
had_children = true; had_children = true;
proxy.push(WorkUnit { proxy.push(WorkUnit {
fun: top_down_func, fun: top_down_func,
data: UnsafeFlowConversions::from_flow(&borrowed_flow_to_unsafe_flow(kid)), data: borrowed_flow_to_unsafe_flow(kid),
}); });
} }
@ -215,7 +193,7 @@ trait ParallelPreorderFlowTraversal : PreorderFlowTraversal {
// If there were no more children, start assigning heights. // If there were no more children, start assigning heights.
if !had_children { if !had_children {
bottom_up_func(UnsafeFlowConversions::from_flow(&unsafe_flow), proxy) bottom_up_func(unsafe_flow, proxy)
} }
} }
} }
@ -225,7 +203,7 @@ impl<'a> ParallelPostorderFlowTraversal for BubbleWidthsTraversal<'a> {}
impl<'a> ParallelPreorderFlowTraversal for AssignWidthsTraversal<'a> { impl<'a> ParallelPreorderFlowTraversal for AssignWidthsTraversal<'a> {
fn run_parallel(&mut self, fn run_parallel(&mut self,
unsafe_flow: UnsafeFlow, unsafe_flow: UnsafeFlow,
proxy: &mut WorkerProxy<*mut LayoutContext,PaddedUnsafeFlow>) { proxy: &mut WorkerProxy<*mut LayoutContext,UnsafeFlow>) {
self.run_parallel_helper(unsafe_flow, self.run_parallel_helper(unsafe_flow,
proxy, proxy,
assign_widths, assign_widths,
@ -395,30 +373,30 @@ fn construct_flows(mut unsafe_layout_node: UnsafeLayoutNode,
} }
} }
fn assign_widths(unsafe_flow: PaddedUnsafeFlow, fn assign_widths(unsafe_flow: UnsafeFlow,
proxy: &mut WorkerProxy<*mut LayoutContext,PaddedUnsafeFlow>) { proxy: &mut WorkerProxy<*mut LayoutContext,UnsafeFlow>) {
let layout_context: &mut LayoutContext = unsafe { let layout_context: &mut LayoutContext = unsafe {
mem::transmute(*proxy.user_data()) mem::transmute(*proxy.user_data())
}; };
let mut assign_widths_traversal = AssignWidthsTraversal { let mut assign_widths_traversal = AssignWidthsTraversal {
layout_context: layout_context, layout_context: layout_context,
}; };
assign_widths_traversal.run_parallel(unsafe_flow.to_flow(), proxy) assign_widths_traversal.run_parallel(unsafe_flow, proxy)
} }
fn assign_heights_and_store_overflow(unsafe_flow: PaddedUnsafeFlow, fn assign_heights_and_store_overflow(unsafe_flow: UnsafeFlow,
proxy: &mut WorkerProxy<*mut LayoutContext,PaddedUnsafeFlow>) { proxy: &mut WorkerProxy<*mut LayoutContext,UnsafeFlow>) {
let layout_context: &mut LayoutContext = unsafe { let layout_context: &mut LayoutContext = unsafe {
mem::transmute(*proxy.user_data()) mem::transmute(*proxy.user_data())
}; };
let mut assign_heights_traversal = AssignHeightsAndStoreOverflowTraversal { let mut assign_heights_traversal = AssignHeightsAndStoreOverflowTraversal {
layout_context: layout_context, layout_context: layout_context,
}; };
assign_heights_traversal.run_parallel(unsafe_flow.to_flow(), proxy) assign_heights_traversal.run_parallel(unsafe_flow, proxy)
} }
fn compute_absolute_position(unsafe_flow: PaddedUnsafeFlow, fn compute_absolute_position(unsafe_flow: UnsafeFlow,
proxy: &mut WorkerProxy<*mut LayoutContext,PaddedUnsafeFlow>) { proxy: &mut WorkerProxy<*mut LayoutContext,UnsafeFlow>) {
let mut had_descendants = false; let mut had_descendants = false;
unsafe { unsafe {
// Get a real flow. // Get a real flow.
@ -448,7 +426,7 @@ fn compute_absolute_position(unsafe_flow: PaddedUnsafeFlow,
had_descendants = true; had_descendants = true;
proxy.push(WorkUnit { proxy.push(WorkUnit {
fun: compute_absolute_position, fun: compute_absolute_position,
data: UnsafeFlowConversions::from_flow(&borrowed_flow_to_unsafe_flow(kid)), data: borrowed_flow_to_unsafe_flow(kid),
}); });
} }
} }
@ -459,21 +437,20 @@ fn compute_absolute_position(unsafe_flow: PaddedUnsafeFlow,
let descendant = absolute_descendant_link; let descendant = absolute_descendant_link;
proxy.push(WorkUnit { proxy.push(WorkUnit {
fun: compute_absolute_position, fun: compute_absolute_position,
data: UnsafeFlowConversions::from_flow(&borrowed_flow_to_unsafe_flow(descendant)), data: borrowed_flow_to_unsafe_flow(descendant),
}); });
} }
// If there were no more descendants, start building the display list. // If there were no more descendants, start building the display list.
if !had_descendants { if !had_descendants {
build_display_list(UnsafeFlowConversions::from_flow( build_display_list(mut_owned_flow_to_unsafe_flow(flow),
&mut_owned_flow_to_unsafe_flow(flow)),
proxy) proxy)
} }
} }
} }
fn build_display_list(mut unsafe_flow: PaddedUnsafeFlow, fn build_display_list(mut unsafe_flow: UnsafeFlow,
proxy: &mut WorkerProxy<*mut LayoutContext,PaddedUnsafeFlow>) { proxy: &mut WorkerProxy<*mut LayoutContext,UnsafeFlow>) {
let layout_context: &mut LayoutContext = unsafe { let layout_context: &mut LayoutContext = unsafe {
mem::transmute(*proxy.user_data()) mem::transmute(*proxy.user_data())
}; };
@ -523,7 +500,7 @@ fn build_display_list(mut unsafe_flow: PaddedUnsafeFlow,
.children_and_absolute_descendant_count .children_and_absolute_descendant_count
.fetch_sub(1, SeqCst) == 1 { .fetch_sub(1, SeqCst) == 1 {
// We were the last child of our parent. Build display lists for our parent. // We were the last child of our parent. Build display lists for our parent.
unsafe_flow = UnsafeFlowConversions::from_flow(&unsafe_parent) unsafe_flow = unsafe_parent
} else { } else {
// Stop. // Stop.
break break
@ -553,7 +530,7 @@ pub fn recalc_style_for_subtree(root_node: &LayoutNode,
pub fn traverse_flow_tree_preorder(root: &mut FlowRef, pub fn traverse_flow_tree_preorder(root: &mut FlowRef,
profiler_chan: ProfilerChan, profiler_chan: ProfilerChan,
layout_context: &mut LayoutContext, layout_context: &mut LayoutContext,
queue: &mut WorkQueue<*mut LayoutContext,PaddedUnsafeFlow>) { queue: &mut WorkQueue<*mut LayoutContext,UnsafeFlow>) {
unsafe { unsafe {
queue.data = mem::transmute(layout_context) queue.data = mem::transmute(layout_context)
} }
@ -561,7 +538,7 @@ pub fn traverse_flow_tree_preorder(root: &mut FlowRef,
profile(time::LayoutParallelWarmupCategory, profiler_chan, || { profile(time::LayoutParallelWarmupCategory, profiler_chan, || {
queue.push(WorkUnit { queue.push(WorkUnit {
fun: assign_widths, fun: assign_widths,
data: UnsafeFlowConversions::from_flow(&mut_owned_flow_to_unsafe_flow(root)), data: mut_owned_flow_to_unsafe_flow(root),
}) })
}); });
@ -573,7 +550,7 @@ pub fn traverse_flow_tree_preorder(root: &mut FlowRef,
pub fn build_display_list_for_subtree(root: &mut FlowRef, pub fn build_display_list_for_subtree(root: &mut FlowRef,
profiler_chan: ProfilerChan, profiler_chan: ProfilerChan,
layout_context: &mut LayoutContext, layout_context: &mut LayoutContext,
queue: &mut WorkQueue<*mut LayoutContext,PaddedUnsafeFlow>) { queue: &mut WorkQueue<*mut LayoutContext,UnsafeFlow>) {
unsafe { unsafe {
queue.data = mem::transmute(layout_context) queue.data = mem::transmute(layout_context)
} }
@ -581,7 +558,7 @@ pub fn build_display_list_for_subtree(root: &mut FlowRef,
profile(time::LayoutParallelWarmupCategory, profiler_chan, || { profile(time::LayoutParallelWarmupCategory, profiler_chan, || {
queue.push(WorkUnit { queue.push(WorkUnit {
fun: compute_absolute_position, fun: compute_absolute_position,
data: UnsafeFlowConversions::from_flow(&mut_owned_flow_to_unsafe_flow(root)), data: mut_owned_flow_to_unsafe_flow(root),
}) })
}); });

2
src/components/main/layout/wrapper.rs
View file

@ -748,7 +748,7 @@ pub trait PostorderNodeMutTraversal {
} }
/// Opaque type stored in type-unsafe work queues for parallel layout. /// Opaque type stored in type-unsafe work queues for parallel layout.
/// Must be transmutable to and from LayoutNode/ThreadsafeLayoutNode/PaddedUnsafeFlow. /// Must be transmutable to and from LayoutNode/ThreadsafeLayoutNode.
pub type UnsafeLayoutNode = (uint, uint); pub type UnsafeLayoutNode = (uint, uint);
pub fn layout_node_to_unsafe_layout_node(node: &LayoutNode) -> UnsafeLayoutNode { pub fn layout_node_to_unsafe_layout_node(node: &LayoutNode) -> UnsafeLayoutNode {