diff options
Diffstat (limited to 'openjdkjvmti/ti_object.cc')
-rw-r--r-- | openjdkjvmti/ti_object.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/openjdkjvmti/ti_object.cc b/openjdkjvmti/ti_object.cc index f37df86048..3333a8a834 100644 --- a/openjdkjvmti/ti_object.cc +++ b/openjdkjvmti/ti_object.cc @@ -105,13 +105,17 @@ jvmtiError ObjectUtil::GetObjectMonitorUsage( notify_wait.push_back(jni->AddLocalReference<jthread>(thd->GetPeerFromOtherThread())); wait.push_back(jni->AddLocalReference<jthread>(thd->GetPeerFromOtherThread())); } + // Scan all threads to see which are waiting on this particular monitor. + std::list<art::Thread*> thread_list; { - // Scan all threads to see which are waiting on this particular monitor. + // Since we're in a SuspendAll, exiting threads are not a concern. art::MutexLock tll(self, *art::Locks::thread_list_lock_); - for (art::Thread* thd : art::Runtime::Current()->GetThreadList()->GetList()) { - if (thd != info.owner_ && target.Ptr() == thd->GetMonitorEnterObject()) { - wait.push_back(jni->AddLocalReference<jthread>(thd->GetPeerFromOtherThread())); - } + thread_list = art::Runtime::Current()->GetThreadList()->GetList(); + } + for (art::Thread* thd : thread_list) { + if (thd != info.owner_ && target.Ptr() == thd->GetMonitorEnterObject()) { + art::mirror::Object* peer = thd->GetPeerFromOtherThread(); + wait.push_back(jni->AddLocalReference<jthread>(peer)); } } } |