Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SoundPool: Avoid busy waiting during stream restart

Browse Source 
A stream on the restart queue can cause the StreamManager to
busy-wait.  This was introduced by a fix
commit ba04dbe773.

Test: Verbose log on StreamManager.cpp, run SoundPool CTS tests.
Bug: 182923919
Change-Id: Iae794bc957869426a4e1e27cd3c088aa9dd83208
This commit is contained in:
Andy Hung
2021-03-15 19:01:51 -07:00
parent d96c8193e2
commit 0821db29bf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/jni/soundpool/StreamManager.cpp
View File

@@ -358,14 +358,14 @@ void StreamManager::addToActiveQueue_l(Stream *stream) {
void StreamManager::run(int32_t id) void StreamManager::run(int32_t id)
{ {
ALOGV("%s(%d) entering", __func__, 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); std::unique_lock lock(mStreamManagerLock);
while (!mQuit) { while (!mQuit) {
if (mRestartStreams.empty()) { // on thread start, mRestartStreams can be non-empty. if (waitTimeNs > 0) {
mStreamManagerCondition.wait_for( mStreamManagerCondition.wait_for(
lock, std::chrono::duration<int64_t, std::nano>(waitTimeNs)); 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(); sanityCheckQueue_l();