commit b4cc884dfe5bb9c1a36bdfbf6a0dfa183d8d321c
author Mathieu Chartier <mathieuc@google.com> Fri Dec 11 04:01:40 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 11 04:01:40 2015 +0000
tree 043036765426dd4842fbbe54c7c94c7c70d695fe
parent 84623e18021451375248af7be44dd0717e681c1f
parent 7d2b04c227b73257d7c282ca9f7147418091e9f6

Merge "Skip DumpForSigQuit if debugger is active"

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index dedc110..291b9a0 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1293,6 +1293,11 @@
 }
 
 void Runtime::DumpForSigQuit(std::ostream& os) {
+  // Dumping for SIGQIT may cause deadlocks if the the debugger is active. b/26118154
+  if (Dbg::IsDebuggerActive()) {
+    LOG(INFO) << "Skipping DumpForSigQuit due to active debugger";
+    return;
+  }
   GetClassLinker()->DumpForSigQuit(os);
   GetInternTable()->DumpForSigQuit(os);
   GetJavaVM()->DumpForSigQuit(os);