summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2012-12-07 11:09:12 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-07 11:09:12 -0800
commita4367996681bae2612beebecb871961c5b361b2c (patch)
treeaf47d944984635af25e733dd3d1b08ae360e5550
parent7e590a04fbb448f576776146a2c8088131c4f8d9 (diff)
parent50f8d2856b6644059b31684687842bf9c1f2e814 (diff)
downloadframeworks_native-a4367996681bae2612beebecb871961c5b361b2c.zip
frameworks_native-a4367996681bae2612beebecb871961c5b361b2c.tar.gz
frameworks_native-a4367996681bae2612beebecb871961c5b361b2c.tar.bz2
am 50f8d285: am d4e70620: am 72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"
* commit '50f8d2856b6644059b31684687842bf9c1f2e814': Revert "ConsumerBase: free buffers outside the lock"
-rw-r--r--libs/gui/ConsumerBase.cpp34
1 files changed, 10 insertions, 24 deletions
diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp
index 3a39bbd..2e7c424 100644
--- a/libs/gui/ConsumerBase.cpp
+++ b/libs/gui/ConsumerBase.cpp
@@ -109,35 +109,21 @@ void ConsumerBase::onFrameAvailable() {
}
void ConsumerBase::onBuffersReleased() {
- sp<GraphicBuffer> bufRefs[BufferQueue::NUM_BUFFER_SLOTS];
-
- { // Scope for the lock
- Mutex::Autolock lock(mMutex);
-
- CB_LOGV("onBuffersReleased");
-
- if (mAbandoned) {
- // Nothing to do if we're already abandoned.
- return;
- }
+ Mutex::Autolock lock(mMutex);
- uint32_t mask = 0;
- mBufferQueue->getReleasedBuffers(&mask);
- for (int i = 0; i < BufferQueue::NUM_BUFFER_SLOTS; i++) {
- if (mask & (1 << i)) {
- // Grab a local reference to the buffers so that they don't
- // get freed while the lock is held.
- bufRefs[i] = mSlots[i].mGraphicBuffer;
+ CB_LOGV("onBuffersReleased");
- freeBufferLocked(i);
- }
- }
+ if (mAbandoned) {
+ // Nothing to do if we're already abandoned.
+ return;
}
- // Clear the local buffer references. This would happen automatically
- // when the array gets dtor'd, but I'm doing it explicitly for clarity.
+ uint32_t mask = 0;
+ mBufferQueue->getReleasedBuffers(&mask);
for (int i = 0; i < BufferQueue::NUM_BUFFER_SLOTS; i++) {
- bufRefs[i].clear();
+ if (mask & (1 << i)) {
+ freeBufferLocked(i);
+ }
}
}