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

Revert rayon stack limits until we sort out the crashtest bustage.

Browse source
This commit is contained in:
Bobby Holley 2017-08-25 11:40:17 -07:00
parent 72c59ff830
commit be67bb87d4
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/context.rs
View file

@ -644,8 +644,8 @@ impl StackLimitChecker {
// //
// The correctness of depends on the assumption that no stack wraps // The correctness of depends on the assumption that no stack wraps
// around the end of the address space. // around the end of the address space.
debug_assert!(curr_sp - self.lower_limit //debug_assert!(curr_sp - self.lower_limit
<= STYLE_THREAD_STACK_SIZE_KB * 1024); // <= STYLE_THREAD_STACK_SIZE_KB * 1024);
// The actual bounds check. // The actual bounds check.
curr_sp <= self.lower_limit curr_sp <= self.lower_limit

5
components/style/gecko/global_style_data.rs
View file

@ -9,7 +9,6 @@ use gecko_bindings::bindings;
use gecko_bindings::bindings::{Gecko_RegisterProfilerThread, Gecko_UnregisterProfilerThread}; use gecko_bindings::bindings::{Gecko_RegisterProfilerThread, Gecko_UnregisterProfilerThread};
use gecko_bindings::bindings::Gecko_SetJemallocThreadLocalArena; use gecko_bindings::bindings::Gecko_SetJemallocThreadLocalArena;
use num_cpus; use num_cpus;
use parallel::STYLE_THREAD_STACK_SIZE_KB;
use rayon; use rayon;
use shared_lock::SharedRwLock; use shared_lock::SharedRwLock;
use std::cmp; use std::cmp;
@ -93,9 +92,9 @@ lazy_static! {
.breadth_first() .breadth_first()
.thread_name(thread_name) .thread_name(thread_name)
.start_handler(thread_startup) .start_handler(thread_startup)
.exit_handler(thread_shutdown) .exit_handler(thread_shutdown);
// Set thread stack size to 128KB. See Gecko bug 1376883. // Set thread stack size to 128KB. See Gecko bug 1376883.
.stack_size(STYLE_THREAD_STACK_SIZE_KB * 1024); //.stack_size(STYLE_THREAD_STACK_SIZE_KB * 1024);
let pool = rayon::ThreadPool::new(configuration).ok(); let pool = rayon::ThreadPool::new(configuration).ok();
pool pool
}; };