commit 78e800e9369636a2a17d668a90eeaab275e83d5e
author Andy Hung <hunga@google.com> Wed Aug 24 22:49:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 24 22:49:39 2016 +0000
tree 5082e5dc00baa6ade8a04be50624074c78079f89
parent 5407107d4172ef6776065fe9be0e444fcb19cada
parent ffd7edc6226844ee3cb047dda0b3597967e6215f

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

Change-Id: I3113d03214a783e51ed14ab92a20ec4d80f38dc9

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