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

Don't hold the prefetcher mutex while prefetching a single source, the lock protects the list of sources and does not guard access to the individual sources.

Browse Source 
related-to- bug: 2413024
This commit is contained in:
Andreas Huber
2010-02-16 14:24:05 -08:00
parent 241379081e
commit 2ae13a9c48
1 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
media/libstagefright/Prefetcher.cpp
View File

@@ -128,46 +128,52 @@ static int64_t kMaxCacheDurationUs = 10000000ll;
void Prefetcher::threadFunc() {
for (;;) {
Mutex::Autolock autoLock(mLock);
if (mDone) {
break;
}
mCondition.waitRelative(mLock, 10000000ll);
sp<PrefetchedSource> minSource;
int64_t minCacheDurationUs = -1;
ssize_t minIndex = -1;
for (size_t i = 0; i < mSources.size(); ++i) {
sp<PrefetchedSource> source = mSources[i].promote();
{
Mutex::Autolock autoLock(mLock);
if (mDone) {
break;
}
mCondition.waitRelative(mLock, 10000000ll);
if (source == NULL) {
int64_t minCacheDurationUs = -1;
ssize_t minIndex = -1;
for (size_t i = 0; i < mSources.size(); ++i) {
sp<PrefetchedSource> source = mSources[i].promote();
if (source == NULL) {
continue;
}
int64_t cacheDurationUs;
if (!source->getCacheDurationUs(&cacheDurationUs)) {
continue;
}
if (cacheDurationUs >= kMaxCacheDurationUs) {
continue;
}
if (minIndex < 0 || cacheDurationUs < minCacheDurationUs) {
minCacheDurationUs = cacheDurationUs;
minIndex = i;
minSource = source;
}
}
if (minIndex < 0) {
continue;
}
int64_t cacheDurationUs;
if (!source->getCacheDurationUs(&cacheDurationUs)) {
continue;
}
if (cacheDurationUs >= kMaxCacheDurationUs) {
continue;
}
if (minIndex < 0 || cacheDurationUs < minCacheDurationUs) {
minCacheDurationUs = cacheDurationUs;
minIndex = i;
}
}
if (minIndex < 0) {
continue;
}
sp<PrefetchedSource> source = mSources[minIndex].promote();
if (source != NULL) {
source->cacheMore();
}
// Make sure not to hold the lock while calling into the source.
// The lock guards the list of sources, not the individual sources
// themselves.
minSource->cacheMore();
}
Mutex::Autolock autoLock(mLock);
for (size_t i = 0; i < mSources.size(); ++i) {
sp<PrefetchedSource> source = mSources[i].promote();