commit dee19e3caaeb5666055842d656dc0516b901f30c
author Mathieu Chartier <mathieuc@google.com> Tue Apr 19 13:46:03 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Apr 19 13:49:03 2016 -0700
tree 76bd7b59db2d8fa82f5e4a5286b1a099dc3d57f8
parent d19dc4688b5b93f149d45435deb0a67217464e37

Do less work holding thread list lock

Avoid doing stuff that requires access java heap like PrettyMethod.
Fixes lock violation.

Bug: 28268478
Change-Id: Ie090879690df7a6db15a9c8b7e82f3809450d653

runtime/monitor.h

diff --git a/runtime/monitor.h b/runtime/monitor.h
index 3d9d10a..8c7496b 100644
--- a/runtime/monitor.h
+++ b/runtime/monitor.h
@@ -211,10 +211,12 @@
       REQUIRES(!monitor_lock_)
       SHARED_REQUIRES(Locks::mutator_lock_);
 
-  static std::string PrettyContentionInfo(Thread* owner,
+  static std::string PrettyContentionInfo(const std::string& owner_name,
+                                          pid_t owner_tid,
                                           ArtMethod* owners_method,
                                           uint32_t owners_dex_pc,
                                           size_t num_waiters)
+      REQUIRES(!Locks::thread_list_lock_)
       SHARED_REQUIRES(Locks::mutator_lock_);
 
   // Wait on a monitor until timeout, interrupt, or notification.  Used for Object.wait() and