commit 7443c9abb22b10fc45895b2171fc0f67866863b7
author Andreas Gampe <agampe@google.com> Wed Nov 26 11:58:42 2014 -0800
committer Andreas Gampe <agampe@google.com> Wed Nov 26 15:45:16 2014 -0800
tree e422ef5fe3ecad66edeb36c1500cbc28e1b859b0
parent 220526b05d4365a1820a694c98527eda2d3dc980

ART: Avoid a recursive abort

When waiting for checkpoints on abort, don't abort on timeout.

Change-Id: Ic87c25d466021d391563f870642251b69dd62af5

runtime/thread_list.cc

diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc
index 5ff90d6..beafcda 100644
--- a/runtime/thread_list.cc
+++ b/runtime/thread_list.cc
@@ -168,7 +168,9 @@
     const uint32_t kWaitTimeoutMs = 10000;
     bool timed_out = barrier_.Increment(self, threads_running_checkpoint, kWaitTimeoutMs);
     if (timed_out) {
-      LOG(kIsDebugBuild ? FATAL : ERROR) << "Unexpected time out during dump checkpoint.";
+      // Avoid a recursive abort.
+      LOG((kIsDebugBuild && (gAborting == 0)) ? FATAL : ERROR)
+          << "Unexpected time out during dump checkpoint.";
     }
   }