Merge "attempt to fix a deadlock in SurfaceTextureClient::disconnect" (00dc9fe0) · Commits · e / os / platform_frameworks_native

libs/gui/BufferQueue.cpp

+9 −8

Original line number	Original line	Diff line number	Diff line
	@@ -111,7 +111,7 @@ status_t BufferQueue::setBufferCountServerLocked(int bufferCount) {
	// easy, we just have more buffers		// easy, we just have more buffers
	mBufferCount = bufferCount;		mBufferCount = bufferCount;
	mServerBufferCount = bufferCount;		mServerBufferCount = bufferCount;
	mDequeueCondition.signal();		mDequeueCondition.broadcast();
	} else {		} else {
	// we're here because we're either		// we're here because we're either
	// - reducing the number of available buffers		// - reducing the number of available buffers
	@@ -192,7 +192,7 @@ status_t BufferQueue::setBufferCount(int bufferCount) {
	mClientBufferCount = bufferCount;		mClientBufferCount = bufferCount;
	mBufferHasBeenQueued = false;		mBufferHasBeenQueued = false;
	mQueue.clear();		mQueue.clear();
	mDequeueCondition.signal();		mDequeueCondition.broadcast();
	return OK;		return OK;
	}		}

	@@ -491,7 +491,7 @@ status_t BufferQueue::setSynchronousMode(bool enabled) {
	// - if the client set the number of buffers, we're guaranteed that		// - if the client set the number of buffers, we're guaranteed that
	// we have at least 3 (because we don't allow less)		// we have at least 3 (because we don't allow less)
	mSynchronousMode = enabled;		mSynchronousMode = enabled;
	mDequeueCondition.signal();		mDequeueCondition.broadcast();
	}		}
	return err;		return err;
	}		}
	@@ -559,7 +559,7 @@ status_t BufferQueue::queueBuffer(int buf, int64_t timestamp,
	mSlots[buf].mFrameNumber = mFrameCounter;		mSlots[buf].mFrameNumber = mFrameCounter;

	mBufferHasBeenQueued = true;		mBufferHasBeenQueued = true;
	mDequeueCondition.signal();		mDequeueCondition.broadcast();

	*outWidth = mDefaultWidth;		*outWidth = mDefaultWidth;
	*outHeight = mDefaultHeight;		*outHeight = mDefaultHeight;
	@@ -596,7 +596,7 @@ void BufferQueue::cancelBuffer(int buf) {
	}		}
	mSlots[buf].mBufferState = BufferSlot::FREE;		mSlots[buf].mBufferState = BufferSlot::FREE;
	mSlots[buf].mFrameNumber = 0;		mSlots[buf].mFrameNumber = 0;
	mDequeueCondition.signal();		mDequeueCondition.broadcast();
	}		}

	status_t BufferQueue::setCrop(const Rect& crop) {		status_t BufferQueue::setCrop(const Rect& crop) {
	@@ -704,7 +704,7 @@ status_t BufferQueue::disconnect(int api) {
	mNextCrop.makeInvalid();		mNextCrop.makeInvalid();
	mNextScalingMode = NATIVE_WINDOW_SCALING_MODE_FREEZE;		mNextScalingMode = NATIVE_WINDOW_SCALING_MODE_FREEZE;
	mNextTransform = 0;		mNextTransform = 0;
	mDequeueCondition.signal();		mDequeueCondition.broadcast();
	} else {		} else {
	ST_LOGE("disconnect: connected to another api (cur=%d, req=%d)",		ST_LOGE("disconnect: connected to another api (cur=%d, req=%d)",
	mConnectedApi, api);		mConnectedApi, api);
	@@ -841,6 +841,7 @@ status_t BufferQueue::acquire(BufferItem *buffer) {

	mSlots[buf].mBufferState = BufferSlot::ACQUIRED;		mSlots[buf].mBufferState = BufferSlot::ACQUIRED;
	mQueue.erase(front);		mQueue.erase(front);
			mDequeueCondition.broadcast();

	ATRACE_INT(mConsumerName.string(), mQueue.size());		ATRACE_INT(mConsumerName.string(), mQueue.size());
	}		}
	@@ -872,7 +873,7 @@ status_t BufferQueue::releaseBuffer(int buf, EGLDisplay display,
	\|\| mSlots[buf].mBufferState == BufferSlot::ACQUIRED) {		\|\| mSlots[buf].mBufferState == BufferSlot::ACQUIRED) {
	mSlots[buf].mBufferState = BufferSlot::FREE;		mSlots[buf].mBufferState = BufferSlot::FREE;
	}		}
	mDequeueCondition.signal();		mDequeueCondition.broadcast();

	return OK;		return OK;
	}		}
	@@ -883,7 +884,7 @@ status_t BufferQueue::consumerDisconnect() {
	// is considered abandoned		// is considered abandoned
	mAbandoned = true;		mAbandoned = true;
	freeAllBuffersLocked();		freeAllBuffersLocked();
	mDequeueCondition.signal();		mDequeueCondition.broadcast();
	return OK;		return OK;
	}		}