stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8146011: sun/management/jmxremote/bootstrap/CustomLauncherTest crash at assert(stack_size)

Browse Source 
We were setting stack_overflow_limit before initialization completed which may change the stack base for some solaris systems with unlimited stack

Reviewed-by: goetz, hseigel, gthornbr
This commit is contained in:
Coleen Phillimore 2015-12-23 20:07:39 +00:00
parent 76d0d92563
commit 384ecfad72
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hotspot/src/share/vm/runtime/thread.cpp
View File

@ -306,10 +306,6 @@ void Thread::clear_thread_current() {
void Thread::record_stack_base_and_size() { void Thread::record_stack_base_and_size() {
set_stack_base(os::current_stack_base()); set_stack_base(os::current_stack_base());
set_stack_size(os::current_stack_size()); set_stack_size(os::current_stack_size());
if (is_Java_thread()) {
((JavaThread*) this)->set_stack_overflow_limit();
((JavaThread*) this)->set_reserved_stack_activation(stack_base());
}
// CR 7190089: on Solaris, primordial thread's stack is adjusted // CR 7190089: on Solaris, primordial thread's stack is adjusted
// in initialize_thread(). Without the adjustment, stack size is // in initialize_thread(). Without the adjustment, stack size is
// incorrect if stack is set to unlimited (ulimit -s unlimited). // incorrect if stack is set to unlimited (ulimit -s unlimited).
@ -318,6 +314,11 @@ void Thread::record_stack_base_and_size() {
// set up any platform-specific state. // set up any platform-specific state.
os::initialize_thread(this); os::initialize_thread(this);
// Set stack limits after thread is initialized.
if (is_Java_thread()) {
((JavaThread*) this)->set_stack_overflow_limit();
((JavaThread*) this)->set_reserved_stack_activation(stack_base());
}
#if INCLUDE_NMT #if INCLUDE_NMT
// record thread's native stack, stack grows downward // record thread's native stack, stack grows downward
MemTracker::record_thread_stack(stack_end(), stack_size()); MemTracker::record_thread_stack(stack_end(), stack_size());