From ba26b51e2e74bf8c4f87e99dc60f1cbca033ecac Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 31 May 2019 13:07:26 -0700 Subject: ART: Skip all-threads dump on abort if locks are held The thread-list locks are not recursive. Skip the dump on abort if the locks are already held. Thread state will still be captured on-device by a tombstone. Bug: 134037466 Bug: 134167395 Test: m Test: m test-art-host-gtest-runtime_test Change-Id: I15ba38a018a39f1cc12577cdf8fb94876b96bbaa --- runtime/runtime_test.cc | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 runtime/runtime_test.cc (limited to 'runtime/runtime_test.cc') diff --git a/runtime/runtime_test.cc b/runtime/runtime_test.cc new file mode 100644 index 0000000000..aa4020e25f --- /dev/null +++ b/runtime/runtime_test.cc @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "android-base/logging.h" +#include "base/locks.h" +#include "base/mutex.h" +#include "common_runtime_test.h" +#include "runtime.h" +#include "thread-current-inl.h" + +namespace art { + +class RuntimeTest : public CommonRuntimeTest {}; + +// Ensure that abort works with ThreadList locks held. + +TEST_F(RuntimeTest, AbortWithThreadListLockHeld) { + // This assumes the test is run single-threaded: do not start the runtime to avoid daemon threads. + + constexpr const char* kDeathRegex = "Skipping all-threads dump as locks are held"; + ASSERT_DEATH({ + // The regex only works if we can ensure output goes to stderr. + android::base::SetLogger(android::base::StderrLogger); + + MutexLock mu(Thread::Current(), *Locks::thread_list_lock_); + Runtime::Abort("Attempt to abort"); + }, kDeathRegex); +} + +} // namespace art -- cgit v1.2.3-59-g8ed1b