diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-09-11 02:38:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-11 02:38:06 +0200 |
| commit | 34f38d9809745e265f52b1789063ce03c7f006ca (patch) | |
| tree | 8fc01467d8801720fd1b6bcb170aa3597b7d648f /src/libstd | |
| parent | ec06633e19025565ad7cb1e62247beb6d2c19409 (diff) | |
| parent | 665291cfa3956a4590052cdf64dd1fb4e3bd1f8f (diff) | |
| download | rust-34f38d9809745e265f52b1789063ce03c7f006ca.tar.gz rust-34f38d9809745e265f52b1789063ce03c7f006ca.zip | |
Rollup merge of #64129 - Wind-River:master_003, r=alexcrichton
vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn r? @alexcrichton cc @n-salim
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/vxworks/fast_thread_local.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/vxworks/process/process_vxworks.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/vxworks/thread.rs | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/libstd/sys/vxworks/fast_thread_local.rs b/src/libstd/sys/vxworks/fast_thread_local.rs index 2e021980778..8b55939b8e5 100644 --- a/src/libstd/sys/vxworks/fast_thread_local.rs +++ b/src/libstd/sys/vxworks/fast_thread_local.rs @@ -1,5 +1,3 @@ -// Copyright (c) 2019 Wind River Systems, Inc. - #![cfg(target_thread_local)] #![unstable(feature = "thread_local_internals", issue = "0")] diff --git a/src/libstd/sys/vxworks/process/process_vxworks.rs b/src/libstd/sys/vxworks/process/process_vxworks.rs index b07966fa206..8780df17a1c 100644 --- a/src/libstd/sys/vxworks/process/process_vxworks.rs +++ b/src/libstd/sys/vxworks/process/process_vxworks.rs @@ -5,6 +5,7 @@ use crate::sys; use crate::sys::cvt; use crate::sys::process::rtp; use crate::sys::process::process_common::*; +use crate::sys_common::thread; //////////////////////////////////////////////////////////////////////////////// // Command @@ -57,8 +58,7 @@ impl Command { self.get_argv().as_ptr() as *const _, // argv *sys::os::environ() as *const *const c_char, 100 as c_int, // initial priority - 0x16000, // initial stack size. 0 defaults - // to 0x4000 in 32 bit and 0x8000 in 64 bit + thread::min_stack(), // initial stack size. 0, // options 0 // task options ); diff --git a/src/libstd/sys/vxworks/thread.rs b/src/libstd/sys/vxworks/thread.rs index ef896f6a6e8..e4396b05c00 100644 --- a/src/libstd/sys/vxworks/thread.rs +++ b/src/libstd/sys/vxworks/thread.rs @@ -8,7 +8,7 @@ use crate::time::Duration; use crate::sys_common::thread::*; -pub const DEFAULT_MIN_STACK_SIZE: usize = 2 * 1024 * 1024; +pub const DEFAULT_MIN_STACK_SIZE: usize = 0x40000; // 256K pub struct Thread { id: libc::pthread_t, |