archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8055338: (process) Add instrumentation to help diagnose JDK-6573254

Browse source 
Reviewed-by: dcubed, ohair, iklam, dholmes, sspitsyn, sla
This commit is contained in:
Ivan Gerasimov 2014-08-21 16:32:36 -07:00
parent 6515584f58
commit 8d7b009834
2 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
hotspot/src/os/windows/vm/os_windows.cpp
View file

@ -409,6 +409,8 @@ struct tm* os::localtime_pd(const time_t* clock, struct tm* res) {
LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo); LONG WINAPI topLevelExceptionFilter(struct _EXCEPTION_POINTERS* exceptionInfo);
extern jint volatile vm_getting_terminated;
// Thread start routine for all new Java threads // Thread start routine for all new Java threads
static unsigned __stdcall java_start(Thread* thread) { static unsigned __stdcall java_start(Thread* thread) {
// Try to randomize the cache line index of hot stack frames. // Try to randomize the cache line index of hot stack frames.
@ -430,9 +432,17 @@ static unsigned __stdcall java_start(Thread* thread) {
} }
} }
// Diagnostic code to investigate JDK-6573254 (Part I)
unsigned res = 90115; // non-java thread
if (thread->is_Java_thread()) {
JavaThread* java_thread = (JavaThread*)thread;
res = java_lang_Thread::is_daemon(java_thread->threadObj())
? 70115 // java daemon thread
: 80115; // java non-daemon thread
}
// Install a win32 structured exception handler around every thread created // Install a win32 structured exception handler around every thread created
// by VM, so VM can genrate error dump when an exception occurred in non- // by VM, so VM can generate error dump when an exception occurred in non-
// Java thread (e.g. VM thread). // Java thread (e.g. VM thread).
__try { __try {
thread->run(); thread->run();
@ -448,6 +458,11 @@ static unsigned __stdcall java_start(Thread* thread) {
Atomic::dec_ptr((intptr_t*)&os::win32::_os_thread_count); Atomic::dec_ptr((intptr_t*)&os::win32::_os_thread_count);
} }
// Diagnostic code to investigate JDK-6573254 (Part II)
if (OrderAccess::load_acquire(&vm_getting_terminated)) {
return res;
}
return 0; return 0;
} }

4
hotspot/src/share/vm/runtime/java.cpp
View file

@ -430,6 +430,8 @@ extern "C" {
} }
} }
jint volatile vm_getting_terminated = 0;
// Note: before_exit() can be executed only once, if more than one threads // Note: before_exit() can be executed only once, if more than one threads
// are trying to shutdown the VM at the same time, only one thread // are trying to shutdown the VM at the same time, only one thread
// can run before_exit() and all other threads must wait. // can run before_exit() and all other threads must wait.
@ -460,6 +462,8 @@ void before_exit(JavaThread * thread) {
} }
} }
OrderAccess::release_store(&vm_getting_terminated, 1);
// The only difference between this and Win32's _onexit procs is that // The only difference between this and Win32's _onexit procs is that
// this version is invoked before any threads get killed. // this version is invoked before any threads get killed.
ExitProc* current = exit_procs; ExitProc* current = exit_procs;