From 3827379b2e414b4c96793dd3555302638db02562 Mon Sep 17 00:00:00 2001 From: Pablo Ceballos Date: Wed, 2 Mar 2016 01:38:10 +0000 Subject: Revert "Revert "Partial revert of "Fix Surface slot caching""" This reverts commit 16c9c304a33af36faa352d32777bc48c50bf7b74. Change-Id: Icbdcba8a646ac40c0533c1c04f5b15769332976c --- libs/gui/BufferQueueConsumer.cpp | 129 ++++++++++++++------------------------- 1 file changed, 47 insertions(+), 82 deletions(-) (limited to 'libs/gui/BufferQueueConsumer.cpp') diff --git a/libs/gui/BufferQueueConsumer.cpp b/libs/gui/BufferQueueConsumer.cpp index b025280382..92285e5811 100644 --- a/libs/gui/BufferQueueConsumer.cpp +++ b/libs/gui/BufferQueueConsumer.cpp @@ -274,51 +274,35 @@ status_t BufferQueueConsumer::detachBuffer(int slot) { ATRACE_CALL(); ATRACE_BUFFER_INDEX(slot); BQ_LOGV("detachBuffer: slot %d", slot); + Mutex::Autolock lock(mCore->mMutex); - sp consumerListener; - sp producerListener; - { - Mutex::Autolock lock(mCore->mMutex); - - if (mCore->mIsAbandoned) { - BQ_LOGE("detachBuffer: BufferQueue has been abandoned"); - return NO_INIT; - } - - if (mCore->mSingleBufferMode || slot == mCore->mSingleBufferSlot) { - BQ_LOGE("detachBuffer: detachBuffer not allowed in single buffer" - "mode"); - return BAD_VALUE; - } - - if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) { - BQ_LOGE("detachBuffer: slot index %d out of range [0, %d)", - slot, BufferQueueDefs::NUM_BUFFER_SLOTS); - return BAD_VALUE; - } else if (!mSlots[slot].mBufferState.isAcquired()) { - BQ_LOGE("detachBuffer: slot %d is not owned by the consumer " - "(state = %s)", slot, mSlots[slot].mBufferState.string()); - return BAD_VALUE; - } - - mSlots[slot].mBufferState.detachConsumer(); - mCore->mActiveBuffers.erase(slot); - mCore->mFreeSlots.insert(slot); - mCore->clearBufferSlotLocked(slot); - mCore->mDequeueCondition.broadcast(); - VALIDATE_CONSISTENCY(); - producerListener = mCore->mConnectedProducerListener; - consumerListener = mCore->mConsumerListener; + if (mCore->mIsAbandoned) { + BQ_LOGE("detachBuffer: BufferQueue has been abandoned"); + return NO_INIT; } - // Call back without lock held - if (producerListener != NULL) { - producerListener->onSlotFreed(slot); + if (mCore->mSingleBufferMode || slot == mCore->mSingleBufferSlot) { + BQ_LOGE("detachBuffer: detachBuffer not allowed in single buffer" + "mode"); + return BAD_VALUE; } - if (consumerListener != NULL) { - consumerListener->onBuffersReleased(); + + if (slot < 0 || slot >= BufferQueueDefs::NUM_BUFFER_SLOTS) { + BQ_LOGE("detachBuffer: slot index %d out of range [0, %d)", + slot, BufferQueueDefs::NUM_BUFFER_SLOTS); + return BAD_VALUE; + } else if (!mSlots[slot].mBufferState.isAcquired()) { + BQ_LOGE("detachBuffer: slot %d is not owned by the consumer " + "(state = %s)", slot, mSlots[slot].mBufferState.string()); + return BAD_VALUE; } + mSlots[slot].mBufferState.detachConsumer(); + mCore->mActiveBuffers.erase(slot); + mCore->mFreeSlots.insert(slot); + mCore->clearBufferSlotLocked(slot); + mCore->mDequeueCondition.broadcast(); + VALIDATE_CONSISTENCY(); return NO_ERROR; } @@ -589,40 +573,30 @@ status_t BufferQueueConsumer::setMaxBufferCount(int bufferCount) { return BAD_VALUE; } - sp listener; - { - Mutex::Autolock lock(mCore->mMutex); - if (mCore->mConnectedApi != BufferQueueCore::NO_CONNECTED_API) { - BQ_LOGE("setMaxBufferCount: producer is already connected"); - return INVALID_OPERATION; - } - - if (bufferCount < mCore->mMaxAcquiredBufferCount) { - BQ_LOGE("setMaxBufferCount: invalid buffer count (%d) less than" - "mMaxAcquiredBufferCount (%d)", bufferCount, - mCore->mMaxAcquiredBufferCount); - return BAD_VALUE; - } + Mutex::Autolock lock(mCore->mMutex); - int delta = mCore->getMaxBufferCountLocked(mCore->mAsyncMode, - mCore->mDequeueBufferCannotBlock, bufferCount) - - mCore->getMaxBufferCountLocked(); - if (!mCore->adjustAvailableSlotsLocked(delta, nullptr)) { - BQ_LOGE("setMaxBufferCount: BufferQueue failed to adjust the number" - " of available slots. Delta = %d", delta); - return BAD_VALUE; - } + if (mCore->mConnectedApi != BufferQueueCore::NO_CONNECTED_API) { + BQ_LOGE("setMaxBufferCount: producer is already connected"); + return INVALID_OPERATION; + } - mCore->mMaxBufferCount = bufferCount; - if (delta < 0) { - listener = mCore->mConsumerListener; - } + if (bufferCount < mCore->mMaxAcquiredBufferCount) { + BQ_LOGE("setMaxBufferCount: invalid buffer count (%d) less than" + "mMaxAcquiredBufferCount (%d)", bufferCount, + mCore->mMaxAcquiredBufferCount); + return BAD_VALUE; } - // Call back without lock held - if (listener != NULL) { - listener->onBuffersReleased(); + int delta = mCore->getMaxBufferCountLocked(mCore->mAsyncMode, + mCore->mDequeueBufferCannotBlock, bufferCount) - + mCore->getMaxBufferCountLocked(); + if (!mCore->adjustAvailableSlotsLocked(delta)) { + BQ_LOGE("setMaxBufferCount: BufferQueue failed to adjust the number of " + "available slots. Delta = %d", delta); + return BAD_VALUE; } + + mCore->mMaxBufferCount = bufferCount; return NO_ERROR; } @@ -637,9 +611,7 @@ status_t BufferQueueConsumer::setMaxAcquiredBufferCount( return BAD_VALUE; } - sp consumerListener; - sp producerListener; - std::vector freedSlots; + sp listener; { // Autolock scope Mutex::Autolock lock(mCore->mMutex); mCore->waitWhileAllocatingLocked(); @@ -676,7 +648,7 @@ status_t BufferQueueConsumer::setMaxAcquiredBufferCount( } int delta = maxAcquiredBuffers - mCore->mMaxAcquiredBufferCount; - if (!mCore->adjustAvailableSlotsLocked(delta, &freedSlots)) { + if (!mCore->adjustAvailableSlotsLocked(delta)) { return BAD_VALUE; } @@ -684,19 +656,12 @@ status_t BufferQueueConsumer::setMaxAcquiredBufferCount( mCore->mMaxAcquiredBufferCount = maxAcquiredBuffers; VALIDATE_CONSISTENCY(); if (delta < 0) { - consumerListener = mCore->mConsumerListener; - producerListener = mCore->mConnectedProducerListener; + listener = mCore->mConsumerListener; } } - // Call back without lock held - if (consumerListener != NULL) { - consumerListener->onBuffersReleased(); - } - if (producerListener != NULL) { - for (int i : freedSlots) { - producerListener->onSlotFreed(i); - } + if (listener != NULL) { + listener->onBuffersReleased(); } return NO_ERROR; -- cgit v1.2.3-59-g8ed1b