commit fbd229147c62d8e8787e27e7c9db3b387ffe39ef
author Ian Rogers <irogers@google.com> Fri Oct 12 14:21:10 2012 -0700
committer Ian Rogers <irogers@google.com> Mon Oct 15 16:36:07 2012 -0700
tree f19776e3edde3c635a7343ca942722a87ba46b62
parent c604d731730b43231f63040c8db1d58304da0cf3

Attempt to always dump all threads when aborting.

Further pursuit of Bug: 7250540

Change-Id: I99628aa4f5666339b372ab8948d3303ad9687eae

src/runtime.cc

diff --git a/src/runtime.cc b/src/runtime.cc
index ee8a8c8..f93d687 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -188,10 +188,13 @@
   void DumpAllThreads(std::ostream& os, Thread* self) NO_THREAD_SAFETY_ANALYSIS {
     bool tll_already_held = Locks::thread_list_lock_->IsExclusiveHeld(self);
     bool ml_already_held = Locks::mutator_lock_->IsSharedHeld(self);
-    if (tll_already_held && ml_already_held) {
-      os << "All threads:\n";
-      Runtime::Current()->GetThreadList()->DumpLocked(os);
+    if (!tll_already_held || !ml_already_held) {
+      os << "Dumping all threads without appropriate locks held:"
+          << (!tll_already_held ? " thread list lock" : "")
+          << (!ml_already_held ? " mutator lock" : "");
     }
+    os << "All threads:\n";
+    Runtime::Current()->GetThreadList()->DumpLocked(os);
   }
 };
 

src/thread_list.cc

diff --git a/src/thread_list.cc b/src/thread_list.cc
index 5ef8625..e288878 100644
--- a/src/thread_list.cc
+++ b/src/thread_list.cc
@@ -110,7 +110,6 @@
 }
 
 void ThreadList::DumpLocked(std::ostream& os) {
-  Locks::thread_list_lock_->AssertHeld(Thread::Current());
   os << "DALVIK THREADS (" << list_.size() << "):\n";
   for (It it = list_.begin(), end = list_.end(); it != end; ++it) {
     (*it)->Dump(os);