commit 5fd8de709af3fa553d46367316ea3659157e6799
author Andy Hung <hunga@google.com> Wed Aug 24 23:04:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 24 23:04:19 2016 +0000
tree 37b56d9fe8ffe69a64103d27e0cfb2cbe0e1e3ba
parent 05e4c8d89ce7d7c3e4ea0e1e7c09a8b3c23616b1
parent 78e800e9369636a2a17d668a90eeaab275e83d5e

LockWatch: Update to Mutex::timeLock specs am: 51a6319111 am: 7b960a5dc5 am: ffd7edc622
am: 78e800e936

Change-Id: Ide1e3fcbc0fd24457960944bd32384ed993a9aea

services/audioflinger/LockWatch.cpp

diff --git a/services/audioflinger/LockWatch.cpp b/services/audioflinger/LockWatch.cpp
index 21eed6e..3da7a3d 100644
--- a/services/audioflinger/LockWatch.cpp
+++ b/services/audioflinger/LockWatch.cpp
@@ -32,8 +32,12 @@
     while (!exitPending()) {
         // we neglect previous lock time effect on period
         usleep(mPeriodMs * 1000);
-        if (mLock.timedLock(milliseconds(mTimeOutMs)) != NO_ERROR) {
-            LOG_ALWAYS_FATAL("LockWatch timeout for: %s", mTag.string());
+        if (mLock.timedLock(ms2ns(mTimeOutMs)) != NO_ERROR) {
+            // FIXME: Current implementation of timedLock uses CLOCK_REALTIME which
+            // increments even during CPU suspend.  Check twice to be sure.
+            if (mLock.timedLock(ms2ns(mTimeOutMs)) != NO_ERROR) {
+                LOG_ALWAYS_FATAL("LockWatch timeout for: %s", mTag.string());
+            }
         }
         mLock.unlock();
     }