diff options
| author | 2022-10-14 20:29:02 +0000 | |
|---|---|---|
| committer | 2022-10-21 22:43:37 +0000 | |
| commit | a23d325152c7cd81ccb426a407f6da280797e61d (patch) | |
| tree | c4c74bbbdeaeb97ebb622b5d8e4ca42589186ddf /test/2011-stack-walk-concurrent-instrument/stack_walk_concurrent.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 'test/2011-stack-walk-concurrent-instrument/stack_walk_concurrent.cc')
| -rw-r--r-- | test/2011-stack-walk-concurrent-instrument/stack_walk_concurrent.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/2011-stack-walk-concurrent-instrument/stack_walk_concurrent.cc b/test/2011-stack-walk-concurrent-instrument/stack_walk_concurrent.cc index 78bb772893..493f1d4073 100644 --- a/test/2011-stack-walk-concurrent-instrument/stack_walk_concurrent.cc +++ b/test/2011-stack-walk-concurrent-instrument/stack_walk_concurrent.cc @@ -81,10 +81,8 @@ extern "C" JNIEXPORT void JNICALL Java_Main_waitAndInstrumentStack(JNIEnv*, jobject target) { while (!instrument_waiting) { } - bool timed_out = false; Thread* other = Runtime::Current()->GetThreadList()->SuspendThreadByPeer( - target, SuspendReason::kInternal, &timed_out); - CHECK(!timed_out); + target, SuspendReason::kInternal); CHECK(other != nullptr); ScopedSuspendAll ssa(__FUNCTION__); Runtime::Current()->GetInstrumentation()->InstrumentThreadStack(other, |