commit dfb0754d31c8f2b0d30d4c842759f8e2266e22cb
author Andy Hung <hunga@google.com> Wed Mar 17 22:16:02 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 17 22:16:02 2021 +0000
tree 8557c0308e4447c18b79c3059e6b9f764a9065d1
parent 79490a9c003280e59c532d2e3bc96969759c8613
parent daa60c22d6666980ef563aeac454dd32b9034f8f

Merge "SoundPool: Avoid busy waiting during stream restart"

media/jni/soundpool/StreamManager.cpp

diff --git a/media/jni/soundpool/StreamManager.cpp b/media/jni/soundpool/StreamManager.cpp
index 49c2b39..309d71c 100644
--- a/media/jni/soundpool/StreamManager.cpp
+++ b/media/jni/soundpool/StreamManager.cpp
@@ -358,14 +358,14 @@
 void StreamManager::run(int32_t id)
 {
     ALOGV("%s(%d) entering", __func__, id);
-    int64_t waitTimeNs = kWaitTimeBeforeCloseNs;
+    int64_t waitTimeNs = 0;  // on thread start, mRestartStreams can be non-empty.
     std::unique_lock lock(mStreamManagerLock);
     while (!mQuit) {
-        if (mRestartStreams.empty()) { // on thread start, mRestartStreams can be non-empty.
+        if (waitTimeNs > 0) {
             mStreamManagerCondition.wait_for(
                     lock, std::chrono::duration<int64_t, std::nano>(waitTimeNs));
         }
-        ALOGV("%s(%d) awake", __func__, id);
+        ALOGV("%s(%d) awake lock waitTimeNs:%lld", __func__, id, (long long)waitTimeNs);
 
         sanityCheckQueue_l();