OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
592a758
)
Revert "Revert "Skip DumpForSigQuit if debugger is active""
author
Mathieu Chartier
<mathieuc@google.com>
Fri, 17 Jun 2016 18:39:15 +0000
(11:39 -0700)
committer
Mathieu Chartier
<mathieuc@google.com>
Fri, 17 Jun 2016 18:39:33 +0000
(11:39 -0700)
Bug:
26118154
This reverts commit
539f7fb0964a184b24bf40c729577be76dd7749a
.
runtime/runtime.cc
patch
|
blob
|
history
diff --git
a/runtime/runtime.cc
b/runtime/runtime.cc
index
bb91602
..
caf5545
100644
(file)
--- a/
runtime/runtime.cc
+++ b/
runtime/runtime.cc
@@
-1379,6
+1379,11
@@
void Runtime::RegisterRuntimeNativeMethods(JNIEnv* env) {
}
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);