summaryrefslogtreecommitdiffstats
path: root/runtime/runtime_linux.cc
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2014-12-09 13:33:38 +0000
committerNicolas Geoffray <ngeoffray@google.com>2014-12-09 13:33:38 +0000
commitdb978719dbcb73fc6acfd193561445c4462786b8 (patch)
treebe75911bfbe29a50fff685217c8ee155fb99ac10 /runtime/runtime_linux.cc
parent015b137efb434528173779bc3ec8d72494456254 (diff)
downloadart-db978719dbcb73fc6acfd193561445c4462786b8.tar.gz
art-db978719dbcb73fc6acfd193561445c4462786b8.tar.bz2
art-db978719dbcb73fc6acfd193561445c4462786b8.zip
Revert "Tidy gAborting."
Creates infinite loop: b/18674776. This reverts commit 015b137efb434528173779bc3ec8d72494456254. Change-Id: I67fe310d2e95ee2ec37bec842be06fb1123b6f4e
Diffstat (limited to 'runtime/runtime_linux.cc')
-rw-r--r--runtime/runtime_linux.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/runtime_linux.cc b/runtime/runtime_linux.cc
index 927309177a..1de035c0d5 100644
--- a/runtime/runtime_linux.cc
+++ b/runtime/runtime_linux.cc
@@ -284,6 +284,7 @@ void HandleUnexpectedSignal(int signal_number, siginfo_t* info, void* raw_contex
}
handlingUnexpectedSignal = true;
+ gAborting++; // set before taking any locks
MutexLock mu(Thread::Current(), *Locks::unexpected_signal_lock_);
bool has_address = (signal_number == SIGILL || signal_number == SIGBUS ||