servo: Merge #18240 - Revert rayon stack limits until we sort out the crashtest bustage (from bholley:revert_small_rayon_stacks); r=emilio

https://treeherder.mozilla.org/logviewer.html#?job_id=125956235&repo=autoland
https://treeherder.mozilla.org/logviewer.html#?job_id=125956235&repo=autoland&lineNumber=13571

Source-Repo: https://github.com/servo/servo
Source-Revision: e3236b5c6bc2366da6d20cbcfa5cd851b1b25f9a

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 08af3948e277162b861a4ccf7dc0a12c45fb761c
This commit is contained in:
Bobby Holley 2017-08-25 14:34:19 -05:00
Родитель 6bf25db065
Коммит 5501c1f685
2 изменённых файлов: 4 добавлений и 5 удалений

Просмотреть файл

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

Просмотреть файл

@ -9,7 +9,6 @@ use gecko_bindings::bindings;
use gecko_bindings::bindings::{Gecko_RegisterProfilerThread, Gecko_UnregisterProfilerThread};
use gecko_bindings::bindings::Gecko_SetJemallocThreadLocalArena;
use num_cpus;
use parallel::STYLE_THREAD_STACK_SIZE_KB;
use rayon;
use shared_lock::SharedRwLock;
use std::cmp;
@ -93,9 +92,9 @@ lazy_static! {
.breadth_first()
.thread_name(thread_name)
.start_handler(thread_startup)
.exit_handler(thread_shutdown)
.exit_handler(thread_shutdown);
// 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();
pool
};