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

auto merge of #2033 : larsbergstrom/servo/disable_parallel_layout, r=metajack

Browse source 
Until we land a fix for #1926, set the default number of threads for parallel layout to 1 to avoid races, a double-borrow, and task failure resulting in all cores spinning indefinitely.

r? @metajack
This commit is contained in:
bors-servo 2014-04-03 23:46:47 -04:00
commit fe1615bc3d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/util/opts.rs
View file

@ -8,8 +8,6 @@
use azure::azure_hl::{BackendType, CairoBackend, CoreGraphicsBackend};
use azure::azure_hl::{CoreGraphicsAcceleratedBackend, Direct2DBackend, SkiaBackend};
use getopts;
use std::cmp;
use std::rt;
use std::io;
use std::os;
@ -144,7 +142,9 @@ pub fn from_cmdline_args(args: &[~str]) -> Option<Opts> {
let layout_threads: uint = match opt_match.opt_str("y") {
Some(layout_threads_str) => from_str(layout_threads_str).unwrap(),
None => cmp::max(rt::default_sched_threads() * 3 / 4, 1),
// FIXME: Re-enable the below computation, once a fix for #1926 lands.
// cmp::max(rt::default_sched_threads() * 3 / 4, 1),
None => 1,
};
Some(Opts {