diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-08-27 23:43:46 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-08-28 15:37:27 -0700 |
| commit | ba32de47e32f436d7c11cb4a2e78bdd4ad4dc5d2 (patch) | |
| tree | 1b56397dfce317d2034feebfb2191bcb09b78823 /runtime/native/dalvik_system_VMStack.cc | |
| parent | 14515d738dadf88e3e00b7dd1bd69899c4df4b91 (diff) | |
Fix issue with Thread.setName hanging after Thread.start
When suspending a thread by peer the invariant that only attached threads are
suspended must be maintained. Add a ThreadList::Contains check which requires
making this method non-static.
Add some extra thread logging.
Bug: 17302037
(cherry picked from commit 37c16453a92bbf1a47f042000318a1b60381017d)
Change-Id: I51832785d4b4b431e035318e75635f442e89a1fb
Diffstat (limited to 'runtime/native/dalvik_system_VMStack.cc')
| -rw-r--r-- | runtime/native/dalvik_system_VMStack.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/native/dalvik_system_VMStack.cc b/runtime/native/dalvik_system_VMStack.cc index b0792293e0..eef1c46c1f 100644 --- a/runtime/native/dalvik_system_VMStack.cc +++ b/runtime/native/dalvik_system_VMStack.cc @@ -34,12 +34,13 @@ static jobject GetThreadStack(const ScopedFastNativeObjectAccess& soa, jobject p } else { // Suspend thread to build stack trace. soa.Self()->TransitionFromRunnableToSuspended(kNative); + ThreadList* thread_list = Runtime::Current()->GetThreadList(); bool timed_out; Thread* thread; { // Take suspend thread lock to avoid races with threads trying to suspend this one. MutexLock mu(soa.Self(), *Locks::thread_list_suspend_thread_lock_); - thread = ThreadList::SuspendThreadByPeer(peer, true, false, &timed_out); + thread = thread_list->SuspendThreadByPeer(peer, true, false, &timed_out); } if (thread != nullptr) { // Must be runnable to create returned array. @@ -47,7 +48,7 @@ static jobject GetThreadStack(const ScopedFastNativeObjectAccess& soa, jobject p trace = thread->CreateInternalStackTrace<false>(soa); soa.Self()->TransitionFromRunnableToSuspended(kNative); // Restart suspended thread. - Runtime::Current()->GetThreadList()->Resume(thread, false); + thread_list->Resume(thread, false); } else { if (timed_out) { LOG(ERROR) << "Trying to get thread's stack failed as the thread failed to suspend within a " |