diff options
| author | 2023-09-09 23:19:28 +0000 | |
|---|---|---|
| committer | 2023-09-09 23:19:28 +0000 | |
| commit | a43e67ea1a314e5c6faf77457ffc5ea39c24d4ca (patch) | |
| tree | 9ffb0fce0deed66670477257567bd9a617449105 /test/2011-stack-walk-concurrent-instrument/stack_walk_concurrent.cc | |
| parent | f9fdd3ce0180972dc8d4f0c8410ea7702828a703 (diff) | |
Revert "Revert^14 "Thread suspension cleanup and deadlock fix""
This reverts commit f9fdd3ce0180972dc8d4f0c8410ea7702828a703.
Reason for revert: Very suspicious host-x86_64-debug failure on LUCI.
Change-Id: Ia01dd3df8d64d6bc0d12319b06a8380f64a46785
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, 3 insertions, 1 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 9ae1bedd23..ae1d8306d1 100644 --- a/test/2011-stack-walk-concurrent-instrument/stack_walk_concurrent.cc +++ b/test/2011-stack-walk-concurrent-instrument/stack_walk_concurrent.cc @@ -81,8 +81,10 @@ 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); + target, SuspendReason::kInternal, &timed_out); + CHECK(!timed_out); CHECK(other != nullptr); ScopedSuspendAll ssa(__FUNCTION__); Runtime::Current()->GetInstrumentation()->InstrumentThreadStack(other, |