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

8186437: Lock held when compiler thread creation fails

Browse Source 
Reviewed-by: stuefe, kvn
This commit is contained in:
Goetz Lindenmaier 2017-08-22 15:12:26 +02:00
parent d1bbcb5a39
commit 192f57c11c
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
hotspot/src/share/vm/compiler/compileBroker.cpp
View File

@ -720,44 +720,49 @@ JavaThread* CompileBroker::make_thread(const char* name, CompileQueue* queue, Co
// At this point it may be possible that no osthread was created for the // At this point it may be possible that no osthread was created for the
// JavaThread due to lack of memory. We would have to throw an exception // JavaThread due to lack of memory. We would have to throw an exception
// in that case. However, since this must work and we do not allow // in that case. However, since this must work and we do not allow
// exceptions anyway, check and abort if this fails. // exceptions anyway, check and abort if this fails. But first release the
// lock.
if (thread == NULL || thread->osthread() == NULL) { if (thread != NULL && thread->osthread() != NULL) {
vm_exit_during_initialization("java.lang.OutOfMemoryError",
os::native_thread_creation_failed_msg());
}
java_lang_Thread::set_thread(thread_oop(), thread); java_lang_Thread::set_thread(thread_oop(), thread);
// Note that this only sets the JavaThread _priority field, which by // Note that this only sets the JavaThread _priority field, which by
// definition is limited to Java priorities and not OS priorities. // definition is limited to Java priorities and not OS priorities.
// The os-priority is set in the CompilerThread startup code itself // The os-priority is set in the CompilerThread startup code itself
java_lang_Thread::set_priority(thread_oop(), NearMaxPriority); java_lang_Thread::set_priority(thread_oop(), NearMaxPriority);
// Note that we cannot call os::set_priority because it expects Java // Note that we cannot call os::set_priority because it expects Java
// priorities and we are *explicitly* using OS priorities so that it's // priorities and we are *explicitly* using OS priorities so that it's
// possible to set the compiler thread priority higher than any Java // possible to set the compiler thread priority higher than any Java
// thread. // thread.
int native_prio = CompilerThreadPriority; int native_prio = CompilerThreadPriority;
if (native_prio == -1) { if (native_prio == -1) {
if (UseCriticalCompilerThreadPriority) { if (UseCriticalCompilerThreadPriority) {
native_prio = os::java_to_os_priority[CriticalPriority]; native_prio = os::java_to_os_priority[CriticalPriority];
} else { } else {
native_prio = os::java_to_os_priority[NearMaxPriority]; native_prio = os::java_to_os_priority[NearMaxPriority];
}
} }
} os::set_native_priority(thread, native_prio);
os::set_native_priority(thread, native_prio);
java_lang_Thread::set_daemon(thread_oop()); java_lang_Thread::set_daemon(thread_oop());
thread->set_threadObj(thread_oop()); thread->set_threadObj(thread_oop());
if (compiler_thread) { if (compiler_thread) {
thread->as_CompilerThread()->set_compiler(comp); thread->as_CompilerThread()->set_compiler(comp);
}
Threads::add(thread);
Thread::start(thread);
} }
Threads::add(thread); }
Thread::start(thread);
// First release lock before aborting VM.
if (thread == NULL || thread->osthread() == NULL) {
vm_exit_during_initialization("java.lang.OutOfMemoryError",
os::native_thread_creation_failed_msg());
} }
// Let go of Threads_lock before yielding // Let go of Threads_lock before yielding