Move the stack size value for L4Re to the min_stack_size function

This commit is contained in:
Sebastian Humenda 2017-09-07 21:04:24 +02:00 committed by Tobias Schaffner
parent 0b77464d22
commit 40794bf4b8
2 changed files with 5 additions and 4 deletions

View File

@ -53,10 +53,6 @@ impl Thread {
let stack_size = cmp::max(stack, min_stack_size(&attr));
// L4Re only supports a maximum of 1Mb per default.
#[cfg(target_os = "l4re")]
let stack_size = cmp::min(stack_size, 1024 * 1024);
match pthread_attr_setstacksize(&mut attr,
stack_size) {
0 => {}

View File

@ -22,7 +22,12 @@ pub fn min_stack() -> usize {
n => return n - 1,
}
let amt = env::var("RUST_MIN_STACK").ok().and_then(|s| s.parse().ok());
#[cfg(not(target_os = "l4re"))]
let amt = amt.unwrap_or(2 * 1024 * 1024);
// L4Re only supports a maximum of 1Mb per default.
#[cfg(target_os = "l4re")]
let amt = amt.unwrap_or(1024 * 1024);
// 0 is our sentinel value, so ensure that we'll never see 0 after
// initialization has run
MIN.store(amt + 1, Ordering::SeqCst);