commit 51a6319111df875710dab25a1a99b10d002c4869
author Andy Hung <hunga@google.com> Tue Aug 23 18:29:04 2016 -0700
committer Andy Hung <hunga@google.com> Wed Aug 24 22:30:34 2016 +0000
tree b1866d49b63a8c4de58b467fd8f7f23f1aec4a32
parent 6d0760dedb56f0833d5f460a745d2618a71ba85e

LockWatch: Update to Mutex::timeLock specs

Bug: 31008450
Change-Id: Ib86e3a385379e222f5c3eb07a36bba9e5b6f5625

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();
     }