OSDN Git Service

Revert "Change thread suspend timeout to be fatal for non-debug"
authorMathieu Chartier <mathieuc@google.com>
Fri, 2 Jun 2017 01:45:10 +0000 (18:45 -0700)
committerMathieu Chartier <mathieuc@google.com>
Fri, 2 Jun 2017 01:47:03 +0000 (18:47 -0700)
For overloaded systems, 10s might not be enough. Infinite seconds
will be though.

Bug: 37221387

Test: test-art-host

This reverts commit d69f82e155118654d989f0b436c019fb6d517341.

Change-Id: I8ac0e13e6bdae1845803682215e1794d892de8e5

runtime/thread_list.cc

index 2e0d866..8c712c5 100644 (file)
@@ -741,7 +741,7 @@ void ThreadList::SuspendAllInternal(Thread* self,
         // EAGAIN and EINTR both indicate a spurious failure, try again from the beginning.
         if ((errno != EAGAIN) && (errno != EINTR)) {
           if (errno == ETIMEDOUT) {
-            LOG(::android::base::FATAL)
+            LOG(kIsDebugBuild ? ::android::base::FATAL : ::android::base::ERROR)
                 << "Timed out waiting for threads to suspend, waited for "
                 << PrettyDuration(NanoTime() - start_time);
           } else {