Merge "bufferpool2.0: Avoid lock during hidl oneway call" (999c0527) · Commits · e / os / android_frameworks_av

media/bufferpool/2.0/AccessorImpl.cpp

+23 −9

Original line number	Diff line number	Diff line
		@@ -253,9 +253,21 @@ void Accessor::Impl::flush() {
		}

		void Accessor::Impl::handleInvalidateAck() {
		std::map<ConnectionId, const sp<IObserver>> observers;
		uint32_t invalidationId;
		{
		std::lock_guard<std::mutex> lock(mBufferPool.mMutex);
		mBufferPool.processStatusMessages();
		mBufferPool.mInvalidation.onHandleAck();
		mBufferPool.mInvalidation.onHandleAck(&observers, &invalidationId);
		}
		// Do not hold lock for send invalidations
		for (auto it = observers.begin(); it != observers.end(); ++it) {
		const sp<IObserver> observer = it->second;
		if (observer) {
		Return<void> transResult = observer->onMessage(it->first, invalidationId);
		(void) transResult;
		}
		}
		}

		bool Accessor::Impl::isValid() {
		@@ -365,19 +377,21 @@ void Accessor::Impl::BufferPool::Invalidation::onInvalidationRequest(
		sInvalidator->addAccessor(mId, impl);
		}

		void Accessor::Impl::BufferPool::Invalidation::onHandleAck() {
		void Accessor::Impl::BufferPool::Invalidation::onHandleAck(
		std::map<ConnectionId, const sp<IObserver>> *observers,
		uint32_t *invalidationId) {
		if (mInvalidationId != 0) {
		*invalidationId = mInvalidationId;
		std::set<int> deads;
		for (auto it = mAcks.begin(); it != mAcks.end(); ++it) {
		if (it->second != mInvalidationId) {
		const sp<IObserver> observer = mObservers[it->first];
		if (observer) {
		ALOGV("connection %lld call observer (%u: %u)",
		observers->emplace(it->first, observer);
		ALOGV("connection %lld will call observer (%u: %u)",
		(long long)it->first, it->second, mInvalidationId);
		Return<void> transResult = observer->onMessage(it->first, mInvalidationId);
		(void) transResult;
		// N.B: ignore possibility of onMessage oneway call being
		// lost.
		// N.B: onMessage will be called later. ignore possibility of
		// onMessage# oneway call being lost.
		it->second = mInvalidationId;
		} else {
		ALOGV("bufferpool2 observer died %lld", (long long)it->first);

media/bufferpool/2.0/AccessorImpl.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -158,7 +158,9 @@ private:
		BufferInvalidationChannel &channel,
		const std::shared_ptr<Accessor::Impl> &impl);

		void onHandleAck();
		void onHandleAck(
		std::map<ConnectionId, const sp<IObserver>> *observers,
		uint32_t *invalidationId);
		} mInvalidation;
		/// Buffer pool statistics which tracks allocation and transfer statistics.
		struct Stats {