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

6988439: Parallel Class Loading test deadlock involving MethodData_lock and Pending List Lock

Browse Source 
Don't acquire methodData_lock while holding pending list lock

Reviewed-by: kvn, never, ysr
This commit is contained in:
Coleen Phillimore 2010-12-10 12:13:03 -05:00
parent 83c72a434a
commit aa521ed9cd
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hotspot/src/share/vm/oops/instanceRefKlass.cpp
View File

@ -457,6 +457,11 @@ void instanceRefKlass::oop_verify_on(oop obj, outputStream* st) {
} }
} }
bool instanceRefKlass::owns_pending_list_lock(JavaThread* thread) {
Handle h_lock(thread, java_lang_ref_Reference::pending_list_lock());
return ObjectSynchronizer::current_thread_holds_lock(thread, h_lock);
}
void instanceRefKlass::acquire_pending_list_lock(BasicLock *pending_list_basic_lock) { void instanceRefKlass::acquire_pending_list_lock(BasicLock *pending_list_basic_lock) {
// we may enter this with pending exception set // we may enter this with pending exception set
PRESERVE_EXCEPTION_MARK; // exceptions are never thrown, needed for TRAPS argument PRESERVE_EXCEPTION_MARK; // exceptions are never thrown, needed for TRAPS argument

1
hotspot/src/share/vm/oops/instanceRefKlass.hpp
View File

@ -89,6 +89,7 @@ class instanceRefKlass: public instanceKlass {
static void release_and_notify_pending_list_lock(BasicLock *pending_list_basic_lock); static void release_and_notify_pending_list_lock(BasicLock *pending_list_basic_lock);
static void acquire_pending_list_lock(BasicLock *pending_list_basic_lock); static void acquire_pending_list_lock(BasicLock *pending_list_basic_lock);
static bool owns_pending_list_lock(JavaThread* thread);
// Update non-static oop maps so 'referent', 'nextPending' and // Update non-static oop maps so 'referent', 'nextPending' and
// 'discovered' will look like non-oops // 'discovered' will look like non-oops

6
hotspot/src/share/vm/oops/methodOop.cpp
View File

@ -309,6 +309,12 @@ void methodOopDesc::print_invocation_count() {
// Build a methodDataOop object to hold information about this method // Build a methodDataOop object to hold information about this method
// collected in the interpreter. // collected in the interpreter.
void methodOopDesc::build_interpreter_method_data(methodHandle method, TRAPS) { void methodOopDesc::build_interpreter_method_data(methodHandle method, TRAPS) {
// Do not profile method if current thread holds the pending list lock,
// which avoids deadlock for acquiring the MethodData_lock.
if (instanceRefKlass::owns_pending_list_lock((JavaThread*)THREAD)) {
return;
}
// Grab a lock here to prevent multiple // Grab a lock here to prevent multiple
// methodDataOops from being created. // methodDataOops from being created.
MutexLocker ml(MethodData_lock, THREAD); MutexLocker ml(MethodData_lock, THREAD);