Merge "Partial revert of "Fix Surface slot caching"" into nyc-dev (8c3d1601) · Commits · e / os / platform_frameworks_native

include/gui/BufferQueueCore.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@

		#include <list>
		#include <set>
		#include <vector>

		#define BQ_LOGV(x, ...) ALOGV("[%s] " x, mConsumerName.string(), ##__VA_ARGS__)
		#define BQ_LOGD(x, ...) ALOGD("[%s] " x, mConsumerName.string(), ##__VA_ARGS__)
		@@ -121,9 +120,8 @@ private:
		void freeAllBuffersLocked();

		// If delta is positive, makes more slots available. If negative, takes
		// away slots. Returns false if the request can't be met. Any slots that
		// were freed will be appended to freedSlots.
		bool adjustAvailableSlotsLocked(int delta, std::vector<int>* freedSlots);
		// away slots. Returns false if the request can't be met.
		bool adjustAvailableSlotsLocked(int delta);

		// waitWhileAllocatingLocked blocks until mIsAllocating is false.
		void waitWhileAllocatingLocked() const;

include/gui/IProducerListener.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -41,9 +41,6 @@ public:
		// This is called without any lock held and can be called concurrently by
		// multiple threads.
		virtual void onBufferReleased() = 0; // Asynchronous

		// onSlotFreed is called when the BufferQueue frees a buffer in a slot.
		virtual void onSlotFreed(int /slot/) {}; // Asynchronous
		};

		class IProducerListener : public ProducerListener, public IInterface

libs/gui/BufferQueueConsumer.cpp

+47 −82

Original line number	Diff line number	Diff line
		@@ -274,10 +274,6 @@ status_t BufferQueueConsumer::detachBuffer(int slot) {
		ATRACE_CALL();
		ATRACE_BUFFER_INDEX(slot);
		BQ_LOGV("detachBuffer: slot %d", slot);

		sp<IConsumerListener> consumerListener;
		sp<IProducerListener> producerListener;
		{
		Mutex::Autolock lock(mCore->mMutex);

		if (mCore->mIsAbandoned) {
		@@ -307,18 +303,6 @@ status_t BufferQueueConsumer::detachBuffer(int slot) {
		mCore->clearBufferSlotLocked(slot);
		mCore->mDequeueCondition.broadcast();
		VALIDATE_CONSISTENCY();
		producerListener = mCore->mConnectedProducerListener;
		consumerListener = mCore->mConsumerListener;
		}

		// Call back without lock held
		if (producerListener != NULL) {
		producerListener->onSlotFreed(slot);
		}
		if (consumerListener != NULL) {
		consumerListener->onBuffersReleased();
		}


		return NO_ERROR;
		}
		@@ -589,9 +573,8 @@ status_t BufferQueueConsumer::setMaxBufferCount(int bufferCount) {
		return BAD_VALUE;
		}

		sp<IConsumerListener> listener;
		{
		Mutex::Autolock lock(mCore->mMutex);

		if (mCore->mConnectedApi != BufferQueueCore::NO_CONNECTED_API) {
		BQ_LOGE("setMaxBufferCount: producer is already connected");
		return INVALID_OPERATION;
		@@ -607,22 +590,13 @@ status_t BufferQueueConsumer::setMaxBufferCount(int bufferCount) {
		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);
		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;
		if (delta < 0) {
		listener = mCore->mConsumerListener;
		}
		}

		// Call back without lock held
		if (listener != NULL) {
		listener->onBuffersReleased();
		}
		return NO_ERROR;
		}

		@@ -637,9 +611,7 @@ status_t BufferQueueConsumer::setMaxAcquiredBufferCount(
		return BAD_VALUE;
		}

		sp<IConsumerListener> consumerListener;
		sp<IProducerListener> producerListener;
		std::vector<int> freedSlots;
		sp<IConsumerListener> 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;

libs/gui/BufferQueueCore.cpp

+1 −8

Original line number	Diff line number	Diff line
		@@ -244,8 +244,7 @@ void BufferQueueCore::freeAllBuffersLocked() {
		VALIDATE_CONSISTENCY();
		}

		bool BufferQueueCore::adjustAvailableSlotsLocked(int delta,
		std::vector<int>* freedSlots) {
		bool BufferQueueCore::adjustAvailableSlotsLocked(int delta) {
		if (delta >= 0) {
		// If we're going to fail, do so before modifying anything
		if (delta > static_cast<int>(mUnusedSlots.size())) {
		@@ -272,17 +271,11 @@ bool BufferQueueCore::adjustAvailableSlotsLocked(int delta,
		clearBufferSlotLocked(*slot);
		mUnusedSlots.push_back(*slot);
		mFreeSlots.erase(slot);
		if (freedSlots) {
		freedSlots->push_back(*slot);
		}
		} else if (!mFreeBuffers.empty()) {
		int slot = mFreeBuffers.back();
		clearBufferSlotLocked(slot);
		mUnusedSlots.push_back(slot);
		mFreeBuffers.pop_back();
		if (freedSlots) {
		freedSlots->push_back(slot);
		}
		} else {
		return false;
		}

libs/gui/BufferQueueProducer.cpp

+143 −248

Original line number	Diff line number	Diff line
		@@ -90,9 +90,7 @@ status_t BufferQueueProducer::setMaxDequeuedBufferCount(
		BQ_LOGV("setMaxDequeuedBufferCount: maxDequeuedBuffers = %d",
		maxDequeuedBuffers);

		sp<IConsumerListener> consumerListener;
		sp<IProducerListener> producerListener;
		std::vector<int> freedSlots;
		sp<IConsumerListener> listener;
		{ // Autolock scope
		Mutex::Autolock lock(mCore->mMutex);
		mCore->waitWhileAllocatingLocked();
		@@ -144,26 +142,20 @@ status_t BufferQueueProducer::setMaxDequeuedBufferCount(
		}

		int delta = maxDequeuedBuffers - mCore->mMaxDequeuedBufferCount;
		if (!mCore->adjustAvailableSlotsLocked(delta, &freedSlots)) {
		if (!mCore->adjustAvailableSlotsLocked(delta)) {
		return BAD_VALUE;
		}
		mCore->mMaxDequeuedBufferCount = maxDequeuedBuffers;
		VALIDATE_CONSISTENCY();
		if (delta < 0) {
		consumerListener = mCore->mConsumerListener;
		producerListener = mCore->mConnectedProducerListener;
		listener = mCore->mConsumerListener;
		}
		mCore->mDequeueCondition.broadcast();
		} // Autolock scope

		// 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;
		@@ -173,9 +165,7 @@ status_t BufferQueueProducer::setAsyncMode(bool async) {
		ATRACE_CALL();
		BQ_LOGV("setAsyncMode: async = %d", async);

		sp<IConsumerListener> consumerListener;
		sp<IProducerListener> producerListener;
		std::vector<int> freedSlots;
		sp<IConsumerListener> listener;
		{ // Autolock scope
		Mutex::Autolock lock(mCore->mMutex);
		mCore->waitWhileAllocatingLocked();
		@@ -201,7 +191,7 @@ status_t BufferQueueProducer::setAsyncMode(bool async) {
		mCore->mDequeueBufferCannotBlock, mCore->mMaxBufferCount)
		- mCore->getMaxBufferCountLocked();

		if (!mCore->adjustAvailableSlotsLocked(delta, &freedSlots)) {
		if (!mCore->adjustAvailableSlotsLocked(delta)) {
		BQ_LOGE("setAsyncMode: BufferQueue failed to adjust the number of "
		"available slots. Delta = %d", delta);
		return BAD_VALUE;
		@@ -209,20 +199,12 @@ status_t BufferQueueProducer::setAsyncMode(bool async) {
		mCore->mAsyncMode = async;
		VALIDATE_CONSISTENCY();
		mCore->mDequeueCondition.broadcast();
		if (delta < 0) {
		consumerListener = mCore->mConsumerListener;
		producerListener = mCore->mConnectedProducerListener;
		}
		listener = mCore->mConsumerListener;
		} // Autolock scope

		// 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;
		}
		@@ -379,9 +361,6 @@ status_t BufferQueueProducer::dequeueBuffer(int *outSlot,
		EGLSyncKHR eglFence = EGL_NO_SYNC_KHR;
		bool attachedByConsumer = false;

		sp<IConsumerListener> consumerListener;
		sp<IProducerListener> producerListener;
		int found = BufferItem::INVALID_BUFFER_SLOT;
		{ // Autolock scope
		Mutex::Autolock lock(mCore->mMutex);
		mCore->waitWhileAllocatingLocked();
		@@ -399,6 +378,7 @@ status_t BufferQueueProducer::dequeueBuffer(int *outSlot,
		height = mCore->mDefaultHeight;
		}

		int found = BufferItem::INVALID_BUFFER_SLOT;
		while (found == BufferItem::INVALID_BUFFER_SLOT) {
		status_t status = waitForFreeSlotThenRelock(FreeSlotCaller::Dequeue,
		&found);
		@@ -428,8 +408,6 @@ status_t BufferQueueProducer::dequeueBuffer(int *outSlot,
		mCore->mFreeSlots.insert(found);
		mCore->clearBufferSlotLocked(found);
		found = BufferItem::INVALID_BUFFER_SLOT;
		consumerListener = mCore->mConsumerListener;
		producerListener = mCore->mConnectedProducerListener;
		continue;
		}
		}
		@@ -466,10 +444,6 @@ status_t BufferQueueProducer::dequeueBuffer(int *outSlot,
		if ((buffer == NULL) \|\|
		buffer->needsReallocation(width, height, format, usage))
		{
		if (buffer != NULL) {
		consumerListener = mCore->mConsumerListener;
		producerListener = mCore->mConnectedProducerListener;
		}
		mSlots[found].mAcquireCalled = false;
		mSlots[found].mGraphicBuffer = NULL;
		mSlots[found].mRequestBufferCalled = false;
		@@ -557,14 +531,6 @@ status_t BufferQueueProducer::dequeueBuffer(int *outSlot,
		mSlots[*outSlot].mFrameNumber,
		mSlots[*outSlot].mGraphicBuffer->handle, returnFlags);

		// Call back without lock held
		if (consumerListener != NULL) {
		consumerListener->onBuffersReleased();
		}
		if (producerListener != NULL) {
		producerListener->onSlotFreed(found);
		}

		return returnFlags;
		}

		@@ -572,10 +538,6 @@ status_t BufferQueueProducer::detachBuffer(int slot) {
		ATRACE_CALL();
		ATRACE_BUFFER_INDEX(slot);
		BQ_LOGV("detachBuffer: slot %d", slot);

		sp<IConsumerListener> consumerListener;
		sp<IProducerListener> producerListener;
		{
		Mutex::Autolock lock(mCore->mMutex);

		if (mCore->mIsAbandoned) {
		@@ -589,8 +551,7 @@ status_t BufferQueueProducer::detachBuffer(int slot) {
		}

		if (mCore->mSingleBufferMode \|\| mCore->mSingleBufferSlot == slot) {
		BQ_LOGE("detachBuffer: cannot detach a buffer in single buffer "
		"mode");
		BQ_LOGE("detachBuffer: cannot detach a buffer in single buffer mode");
		return BAD_VALUE;
		}

		@@ -614,17 +575,6 @@ status_t BufferQueueProducer::detachBuffer(int slot) {
		mCore->clearBufferSlotLocked(slot);
		mCore->mDequeueCondition.broadcast();
		VALIDATE_CONSISTENCY();
		producerListener = mCore->mConnectedProducerListener;
		consumerListener = mCore->mConsumerListener;
		}

		// Call back without lock held
		if (consumerListener != NULL) {
		consumerListener->onBuffersReleased();
		}
		if (producerListener != NULL) {
		producerListener->onSlotFreed(slot);
		}

		return NO_ERROR;
		}
		@@ -641,11 +591,8 @@ status_t BufferQueueProducer::detachNextBuffer(sp<GraphicBuffer>* outBuffer,
		return BAD_VALUE;
		}

		sp<IConsumerListener> consumerListener;
		sp<IProducerListener> producerListener;
		int found = BufferQueueCore::INVALID_BUFFER_SLOT;
		{
		Mutex::Autolock lock(mCore->mMutex);

		if (mCore->mIsAbandoned) {
		BQ_LOGE("detachNextBuffer: BufferQueue has been abandoned");
		return NO_INIT;
		@@ -668,7 +615,7 @@ status_t BufferQueueProducer::detachNextBuffer(sp<GraphicBuffer>* outBuffer,
		return NO_MEMORY;
		}

		found = mCore->mFreeBuffers.front();
		int found = mCore->mFreeBuffers.front();
		mCore->mFreeBuffers.remove(found);
		mCore->mFreeSlots.insert(found);

		@@ -678,17 +625,6 @@ status_t BufferQueueProducer::detachNextBuffer(sp<GraphicBuffer>* outBuffer,
		*outFence = mSlots[found].mFence;
		mCore->clearBufferSlotLocked(found);
		VALIDATE_CONSISTENCY();
		consumerListener = mCore->mConsumerListener;
		producerListener = mCore->mConnectedProducerListener;
		}

		// Call back without lock held
		if (consumerListener != NULL) {
		consumerListener->onBuffersReleased();
		}
		if (producerListener != NULL) {
		producerListener->onSlotFreed(found);
		}

		return NO_ERROR;
		}
		@@ -1084,11 +1020,6 @@ int BufferQueueProducer::query(int what, int *outValue) {
		status_t BufferQueueProducer::connect(const sp<IProducerListener>& listener,
		int api, bool producerControlledByApp, QueueBufferOutput *output) {
		ATRACE_CALL();
		int status = NO_ERROR;
		sp<IConsumerListener> consumerListener;
		sp<IProducerListener> producerListener;
		std::vector<int> freedSlots;
		{
		Mutex::Autolock lock(mCore->mMutex);
		mConsumerName = mCore->mConsumerName;
		BQ_LOGV("connect: api=%d producerControlledByApp=%s", api,
		@@ -1115,19 +1046,18 @@ status_t BufferQueueProducer::connect(const sp<IProducerListener>& listener,
		return BAD_VALUE;
		}

		bool dequeueBufferCannotBlock = mDequeueTimeout < 0 ?
		mCore->mConsumerControlledByApp && producerControlledByApp :
		false;
		int delta = mCore->getMaxBufferCountLocked(mCore->mAsyncMode,
		dequeueBufferCannotBlock, mCore->mMaxBufferCount) -
		mDequeueTimeout < 0 ?
		mCore->mConsumerControlledByApp && producerControlledByApp : false,
		mCore->mMaxBufferCount) -
		mCore->getMaxBufferCountLocked();

		if (!mCore->adjustAvailableSlotsLocked(delta, &freedSlots)) {
		BQ_LOGE("connect: BufferQueue failed to adjust the number of "
		"available slots. Delta = %d", delta);
		if (!mCore->adjustAvailableSlotsLocked(delta)) {
		BQ_LOGE("connect: BufferQueue failed to adjust the number of available "
		"slots. Delta = %d", delta);
		return BAD_VALUE;
		}

		int status = NO_ERROR;
		switch (api) {
		case NATIVE_WINDOW_API_EGL:
		case NATIVE_WINDOW_API_CPU:
		@@ -1141,8 +1071,7 @@ status_t BufferQueueProducer::connect(const sp<IProducerListener>& listener,
		// Set up a death notification so that we can disconnect
		// automatically if the remote producer dies
		if (listener != NULL &&
		IInterface::asBinder(listener)->remoteBinder() !=
		NULL) {
		IInterface::asBinder(listener)->remoteBinder() != NULL) {
		status = IInterface::asBinder(listener)->linkToDeath(
		static_cast<IBinder::DeathRecipient*>(this));
		if (status != NO_ERROR) {
		@@ -1159,27 +1088,14 @@ status_t BufferQueueProducer::connect(const sp<IProducerListener>& listener,
		}

		mCore->mBufferHasBeenQueued = false;
		mCore->mDequeueBufferCannotBlock = dequeueBufferCannotBlock;
		mCore->mDequeueBufferCannotBlock = false;
		if (mDequeueTimeout < 0) {
		mCore->mDequeueBufferCannotBlock =
		mCore->mConsumerControlledByApp && producerControlledByApp;
		}

		mCore->mAllowAllocation = true;
		VALIDATE_CONSISTENCY();

		if (delta < 0) {
		consumerListener = mCore->mConsumerListener;
		producerListener = listener;
		}
		}

		// Call back without lock held
		if (consumerListener != NULL) {
		consumerListener->onBuffersReleased();
		}
		if (producerListener != NULL) {
		for (int i : freedSlots) {
		producerListener->onSlotFreed(i);
		}
		}

		return status;
		}

		@@ -1397,16 +1313,12 @@ status_t BufferQueueProducer::setDequeueTimeout(nsecs_t timeout) {
		ATRACE_CALL();
		BQ_LOGV("setDequeueTimeout: %" PRId64, timeout);

		sp<IConsumerListener> consumerListener;
		sp<IProducerListener> producerListener;
		std::vector<int> freedSlots;
		{
		Mutex::Autolock lock(mCore->mMutex);
		int delta = mCore->getMaxBufferCountLocked(mCore->mAsyncMode, false,
		mCore->mMaxBufferCount) - mCore->getMaxBufferCountLocked();
		if (!mCore->adjustAvailableSlotsLocked(delta, &freedSlots)) {
		BQ_LOGE("setDequeueTimeout: BufferQueue failed to adjust the number"
		" of available slots. Delta = %d", delta);
		if (!mCore->adjustAvailableSlotsLocked(delta)) {
		BQ_LOGE("setDequeueTimeout: BufferQueue failed to adjust the number of "
		"available slots. Delta = %d", delta);
		return BAD_VALUE;
		}

		@@ -1414,23 +1326,6 @@ status_t BufferQueueProducer::setDequeueTimeout(nsecs_t timeout) {
		mCore->mDequeueBufferCannotBlock = false;

		VALIDATE_CONSISTENCY();

		if (delta < 0) {
		consumerListener = mCore->mConsumerListener;
		producerListener = mCore->mConnectedProducerListener;
		}
		}

		// Call back without lock held
		if (consumerListener != NULL) {
		consumerListener->onBuffersReleased();
		}
		if (producerListener != NULL) {
		for (int i : freedSlots) {
		producerListener->onSlotFreed(i);
		}
		}

		return NO_ERROR;
		}