From db576f8103ed0cdda4e77d977c1eab8456233e11 Mon Sep 17 00:00:00 2001 From: Baoshan Pang Date: Sun, 1 Sep 2019 17:56:36 -0700 Subject: [PATCH 1/2] vxWorks: set DEFAULT_MIN_STACK_SIZE to 256K and use min_stack to pass initial stack size to rtpSpawn --- src/libstd/sys/vxworks/process/process_vxworks.rs | 6 ++++-- src/libstd/sys/vxworks/thread.rs | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/libstd/sys/vxworks/process/process_vxworks.rs b/src/libstd/sys/vxworks/process/process_vxworks.rs index b07966fa20626..12aa779746866 100644 --- a/src/libstd/sys/vxworks/process/process_vxworks.rs +++ b/src/libstd/sys/vxworks/process/process_vxworks.rs @@ -1,3 +1,5 @@ +// Copyright (c) 2019 Wind River Systems, Inc. + use crate::io::{self, Error, ErrorKind}; use libc::{self, c_int, c_char}; use libc::{RTP_ID}; @@ -5,6 +7,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 +60,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 ef896f6a6e8cf..f9305afdeb6d1 100644 --- a/src/libstd/sys/vxworks/thread.rs +++ b/src/libstd/sys/vxworks/thread.rs @@ -1,3 +1,5 @@ +// Copyright (c) 2019 Wind River Systems, Inc. + use crate::cmp; use crate::ffi::CStr; use crate::io; @@ -8,7 +10,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, From 5318f98c06bc99292ea6241804a03b26eab8d8b5 Mon Sep 17 00:00:00 2001 From: Baoshan Pang Date: Tue, 10 Sep 2019 09:25:22 -0700 Subject: [PATCH 2/2] remove Copyright notic --- src/libstd/sys/vxworks/fast_thread_local.rs | 2 -- src/libstd/sys/vxworks/process/process_vxworks.rs | 2 -- src/libstd/sys/vxworks/thread.rs | 2 -- 3 files changed, 6 deletions(-) diff --git a/src/libstd/sys/vxworks/fast_thread_local.rs b/src/libstd/sys/vxworks/fast_thread_local.rs index 2e021980778e5..8b55939b8e54a 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 12aa779746866..8780df17a1c7e 100644 --- a/src/libstd/sys/vxworks/process/process_vxworks.rs +++ b/src/libstd/sys/vxworks/process/process_vxworks.rs @@ -1,5 +1,3 @@ -// Copyright (c) 2019 Wind River Systems, Inc. - use crate::io::{self, Error, ErrorKind}; use libc::{self, c_int, c_char}; use libc::{RTP_ID}; diff --git a/src/libstd/sys/vxworks/thread.rs b/src/libstd/sys/vxworks/thread.rs index f9305afdeb6d1..e4396b05c0065 100644 --- a/src/libstd/sys/vxworks/thread.rs +++ b/src/libstd/sys/vxworks/thread.rs @@ -1,5 +1,3 @@ -// Copyright (c) 2019 Wind River Systems, Inc. - use crate::cmp; use crate::ffi::CStr; use crate::io;