diff options
| author | Andreas Gampe <agampe@google.com> | 2019-05-31 16:54:46 -0700 |
|---|---|---|
| committer | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-06-04 01:04:45 +0000 |
| commit | 56a985ffa086b49cc30a46fc936fad9113c01beb (patch) | |
| tree | 31c4c5110aa509c21d1f3ac446fea67c86aca7f5 /runtime/runtime_test.cc | |
| parent | 907a085824254e1a2d666df6bc5aae92cd7ba7db (diff) | |
| download | art-56a985ffa086b49cc30a46fc936fad9113c01beb.tar.gz art-56a985ffa086b49cc30a46fc936fad9113c01beb.tar.bz2 art-56a985ffa086b49cc30a46fc936fad9113c01beb.zip | |
ART: Allow thread suspend lock to be held when dumping a thread
Only dumping a thread's suspend state requires holding the lock.
Specialize the code to recognize if the lock is already held,
and remove the negative capability from the callers.
Bug: 134037466
Bug: 134167395
Test: m
Test: m test-art-host-gtest-runtime_test
Merged-In: Ib55eafba72c5d15de01719840ba3f223ae4af8c7
Change-Id: Ib55eafba72c5d15de01719840ba3f223ae4af8c7
Diffstat (limited to 'runtime/runtime_test.cc')
| -rw-r--r-- | runtime/runtime_test.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/runtime/runtime_test.cc b/runtime/runtime_test.cc index aa4020e25f..282e43071e 100644 --- a/runtime/runtime_test.cc +++ b/runtime/runtime_test.cc @@ -40,4 +40,18 @@ TEST_F(RuntimeTest, AbortWithThreadListLockHeld) { }, kDeathRegex); } + +TEST_F(RuntimeTest, AbortWithThreadSuspendCountLockHeld) { + // 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_suspend_count_lock_); + Runtime::Abort("Attempt to abort"); + }, kDeathRegex); +} + } // namespace art |