commit a9b097443f26a6df1a322a8fef50fdd1f26a410b
author Ian Rogers <irogers@google.com> Wed Oct 08 23:25:54 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 08 23:25:55 2014 +0000
tree 900699b9872d966d9af687596c2a5d295f5e00bb
parent 477989496bfb8d1d9687d7ad8ee5b9ede80dc410
parent 832336b3c9eb892045a8de1bb12c9361112ca3c5

Merge "Don't copy fill array data to quick literal pool."

runtime/base/mutex.cc

diff --git a/runtime/base/mutex.cc b/runtime/base/mutex.cc
index 4383a7c..cbcd408 100644
--- a/runtime/base/mutex.cc
+++ b/runtime/base/mutex.cc
@@ -648,7 +648,13 @@
 void ReaderWriterMutex::Dump(std::ostream& os) const {
   os << name_
       << " level=" << static_cast<int>(level_)
-      << " owner=" << GetExclusiveOwnerTid() << " ";
+      << " owner=" << GetExclusiveOwnerTid()
+#if ART_USE_FUTEXES
+      << " state=" << state_.LoadSequentiallyConsistent()
+      << " num_pending_writers=" << num_pending_writers_.LoadSequentiallyConsistent()
+      << " num_pending_readers=" << num_pending_readers_.LoadSequentiallyConsistent()
+#endif
+      << " ";
   DumpContention(os);
 }
 

runtime/thread_list.cc

diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc
index ec5b775..53c2859 100644
--- a/runtime/thread_list.cc
+++ b/runtime/thread_list.cc
@@ -199,6 +199,8 @@
   Runtime* runtime = Runtime::Current();
   std::ostringstream ss;
   ss << "Thread suspend timeout\n";
+  Locks::mutator_lock_->Dump(ss);
+  ss << "\n";
   runtime->GetThreadList()->Dump(ss);
   LOG(FATAL) << ss.str();
   exit(0);