diff options
Diffstat (limited to 'components/layout_thread/lib.rs')
| -rw-r--r-- | components/layout_thread/lib.rs | 65 |
1 files changed, 35 insertions, 30 deletions
diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index 19593c72d77..04f35183ff4 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -175,6 +175,9 @@ pub struct LayoutThread { /// The workers that we use for parallel operation. parallel_traversal: Option<rayon::ThreadPool>, + /// Flag to indicate whether to use parallel operations + parallel_flag: bool, + /// Starts at zero, and increased by one every time a layout completes. /// This can be used to easily check for invalid stale data. generation: u32, @@ -389,13 +392,11 @@ impl LayoutThread { let device = Device::new( MediaType::Screen, opts::get().initial_window_size.to_f32() * ScaleFactor::new(1.0)); - let parallel_traversal = if layout_threads != 1 { - let configuration = - rayon::Configuration::new().set_num_threads(layout_threads); - rayon::ThreadPool::new(configuration).ok() - } else { - None - }; + + let configuration = + rayon::Configuration::new().set_num_threads(layout_threads); + let parallel_traversal = rayon::ThreadPool::new(configuration).ok(); + debug!("Possible layout Threads: {}", layout_threads); // Create the channel on which new animations can be sent. let (new_animations_sender, new_animations_receiver) = channel(); @@ -441,6 +442,7 @@ impl LayoutThread { font_cache_receiver: font_cache_receiver, font_cache_sender: ipc_font_cache_sender, parallel_traversal: parallel_traversal, + parallel_flag: true, generation: 0, new_animations_sender: new_animations_sender, new_animations_receiver: new_animations_receiver, @@ -979,6 +981,13 @@ impl LayoutThread { (data.reflow_info.goal == ReflowGoal::ForScriptQuery && data.query_type != ReflowQueryType::NoQuery)); + // Parallelize if there's more than 750 objects based on rzambre's suggestion + // https://github.com/servo/servo/issues/10110 + self.parallel_flag = self.layout_threads > 1 && data.dom_count > 750; + debug!("layout: received layout request for: {}", self.url); + debug!("Number of objects in DOM: {}", data.dom_count); + debug!("layout: parallel? {}", self.parallel_flag); + let mut rw_data = possibly_locked_rw_data.lock(); let element: ServoLayoutElement = match document.root_node() { @@ -1140,18 +1149,16 @@ impl LayoutThread { self.time_profiler_chan.clone(), || { // Perform CSS selector matching and flow construction. - match self.parallel_traversal { - None => { - sequential::traverse_dom::<ServoLayoutNode, RecalcStyleAndConstructFlows>( - element.as_node(), &shared_layout_context); - } - Some(ref mut traversal) => { - parallel::traverse_dom::<ServoLayoutNode, RecalcStyleAndConstructFlows>( - element.as_node(), dom_depth, &shared_layout_context, traversal); - } + if let (true, Some(traversal)) = (self.parallel_flag, self.parallel_traversal.as_mut()) { + // Parallel mode + parallel::traverse_dom::<ServoLayoutNode, RecalcStyleAndConstructFlows>( + element.as_node(), dom_depth, &shared_layout_context, traversal); + } else { + // Sequential mode + sequential::traverse_dom::<ServoLayoutNode, RecalcStyleAndConstructFlows>( + element.as_node(), &shared_layout_context); } }); - // TODO(pcwalton): Measure energy usage of text shaping, perhaps? let text_shaping_time = (font::get_and_reset_text_shaping_performance_counter() as u64) / @@ -1402,19 +1409,17 @@ impl LayoutThread { self.time_profiler_chan.clone(), || { let profiler_metadata = self.profiler_metadata(); - match self.parallel_traversal { - None => { - // Sequential mode. - LayoutThread::solve_constraints(FlowRef::deref_mut(&mut root_flow), &layout_context) - } - Some(ref mut parallel) => { - // Parallel mode. - LayoutThread::solve_constraints_parallel(parallel, - FlowRef::deref_mut(&mut root_flow), - profiler_metadata, - self.time_profiler_chan.clone(), - &*layout_context); - } + + if let (true, Some(traversal)) = (self.parallel_flag, self.parallel_traversal.as_mut()) { + // Parallel mode. + LayoutThread::solve_constraints_parallel(traversal, + FlowRef::deref_mut(&mut root_flow), + profiler_metadata, + self.time_profiler_chan.clone(), + &*layout_context); + } else { + //Sequential mode + LayoutThread::solve_constraints(FlowRef::deref_mut(&mut root_flow), &layout_context) } }); } |