diff options
author | 2022-10-14 20:29:02 +0000 | |
---|---|---|
committer | 2022-10-21 22:43:37 +0000 | |
commit | a23d325152c7cd81ccb426a407f6da280797e61d (patch) | |
tree | c4c74bbbdeaeb97ebb622b5d8e4ca42589186ddf /runtime/native/dalvik_system_VMStack.cc | |
parent | 3e1b1f8ff913d2fb811e3fe5714552fc98000d15 (diff) |
Revert^4 "Thread suspension cleanup and deadlock fix"
This reverts commit ebd76406bf5fa74185998bc29f0f27c20fa2e683.
PS1 is identical to aosp/2216806.
PS2 in addition converts the RunCheckpoint call used from
StackUtil::GetAllStackTraces to RunCheckpointUnchecked to temporarily
work around another checkpoint Run() function lock ordering
issue.
PS3 is a nontrivial rebase.
Test: Build and boot AOSP, Treehugger
Bug: 240742796
Bug: 203363895
Bug: 238032384
Bug: 253671779
Change-Id: I38385e41392652cc30e5e74fd8b93e22088827a5
Diffstat (limited to 'runtime/native/dalvik_system_VMStack.cc')
-rw-r--r-- | runtime/native/dalvik_system_VMStack.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/runtime/native/dalvik_system_VMStack.cc b/runtime/native/dalvik_system_VMStack.cc index 71078c9ad2..7b21de204d 100644 --- a/runtime/native/dalvik_system_VMStack.cc +++ b/runtime/native/dalvik_system_VMStack.cc @@ -57,10 +57,7 @@ static ResultT GetThreadStack(const ScopedFastNativeObjectAccess& soa, // Suspend thread to build stack trace. ScopedThreadSuspension sts(soa.Self(), ThreadState::kNative); ThreadList* thread_list = Runtime::Current()->GetThreadList(); - bool timed_out; - Thread* thread = thread_list->SuspendThreadByPeer(peer, - SuspendReason::kInternal, - &timed_out); + Thread* thread = thread_list->SuspendThreadByPeer(peer, SuspendReason::kInternal); if (thread != nullptr) { // Must be runnable to create returned array. { @@ -70,9 +67,6 @@ static ResultT GetThreadStack(const ScopedFastNativeObjectAccess& soa, // Restart suspended thread. bool resumed = thread_list->Resume(thread, SuspendReason::kInternal); DCHECK(resumed); - } else if (timed_out) { - LOG(ERROR) << "Trying to get thread's stack failed as the thread failed to suspend within a " - "generous timeout."; } } return trace; |