commit 320f7d2c14c1bfbd1238cb86118f9c46df7b5945
author Andy Hung <hunga@google.com> Mon Oct 23 16:31:33 2023 -0700
committer Andy Hung <hunga@google.com> Mon Oct 23 20:24:02 2023 -0700
tree 02c42d1cc8494717882f50b5c2db5089e3fbf1ea
parent b2cb48a661a1e5f3b75cabac399dd1600b1945fb

AudioFlinger: move pthread_mutex_timedlock into audio_utils::mutex

Using a class method avoids external usage of
audio_utils::mutex native_handle().

Test: adb shell dumpsys media.audio_flinger
Bug: 307398860
Change-Id: If131279a6f14249d2058254a3c331adfcdc9b25a

services/audioflinger/afutils/DumpTryLock.h

diff --git a/services/audioflinger/afutils/DumpTryLock.h b/services/audioflinger/afutils/DumpTryLock.h
index e4ad112..05e050e 100644
--- a/services/audioflinger/afutils/DumpTryLock.h
+++ b/services/audioflinger/afutils/DumpTryLock.h
@@ -19,7 +19,6 @@
 
 #include <audio_utils/mutex.h>
 #include <utils/Mutex.h>
-#include <utils/Timers.h>
 
 namespace android::afutils {
 
@@ -36,13 +35,7 @@
 inline bool dumpTryLock(audio_utils::mutex& mutex) TRY_ACQUIRE(true, mutex)
 {
     static constexpr int64_t kDumpLockTimeoutNs = 1'000'000'000;
-
-    const int64_t timeoutNs = kDumpLockTimeoutNs + systemTime(SYSTEM_TIME_REALTIME);
-    const struct timespec ts = {
-        .tv_sec = static_cast<time_t>(timeoutNs / 1000000000),
-        .tv_nsec = static_cast<long>(timeoutNs % 1000000000),
-    };
-    return pthread_mutex_timedlock(mutex.native_handle(), &ts) == 0;
+    return mutex.try_lock(kDumpLockTimeoutNs);
 }
 
 }  // android::afutils