Merge "Time duration blocked on dequeueBuffer for stuffing recovery" into main (23ab25b0) · Commits · e / devices / smdk4412 / android_frameworks_native

libs/gui/BLASTBufferQueue.cpp

+12 −7

Original line number	Diff line number	Diff line
		@@ -1221,16 +1221,12 @@ public:
		#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BUFFER_RELEASE_CHANNEL)
		status_t waitForBufferRelease(std::unique_lock<std::mutex>& bufferQueueLock,
		nsecs_t timeout) const override {
		const auto startTime = std::chrono::steady_clock::now();
		sp<BLASTBufferQueue> bbq = mBLASTBufferQueue.promote();
		if (!bbq) {
		return OK;
		}

		// Provide a callback for Choreographer to start buffer stuffing recovery when blocked
		// on buffer release.
		std::function<void()> callbackCopy = bbq->getWaitForBufferReleaseCallback();
		if (callbackCopy) callbackCopy();

		// BufferQueue has already checked if we have a free buffer. If there's an unread interrupt,
		// we want to ignore it. This must be done before unlocking the BufferQueue lock to ensure
		// we don't miss an interrupt.
		@@ -1252,6 +1248,14 @@ public:
		}

		bbq->releaseBufferCallback(id, fence, maxAcquiredBufferCount);
		const nsecs_t durationNanos = std::chrono::duration_cast<std::chrono::nanoseconds>(
		std::chrono::steady_clock::now() - startTime)
		.count();
		// Provide a callback for Choreographer to start buffer stuffing recovery when blocked
		// on buffer release.
		std::function<void(const nsecs_t)> callbackCopy = bbq->getWaitForBufferReleaseCallback();
		if (callbackCopy) callbackCopy(durationNanos);

		return OK;
		}
		#endif
		@@ -1343,12 +1347,13 @@ void BLASTBufferQueue::setApplyToken(sp<IBinder> applyToken) {
		mApplyToken = std::move(applyToken);
		}

		void BLASTBufferQueue::setWaitForBufferReleaseCallback(std::function<void()> callback) {
		void BLASTBufferQueue::setWaitForBufferReleaseCallback(
		std::function<void(const nsecs_t)> callback) {
		std::lock_guard _lock{mWaitForBufferReleaseMutex};
		mWaitForBufferReleaseCallback = std::move(callback);
		}

		std::function<void()> BLASTBufferQueue::getWaitForBufferReleaseCallback() const {
		std::function<void(const nsecs_t)> BLASTBufferQueue::getWaitForBufferReleaseCallback() const {
		std::lock_guard _lock{mWaitForBufferReleaseMutex};
		return mWaitForBufferReleaseCallback;
		}

libs/gui/include/gui/BLASTBufferQueue.h

+4 −3

Original line number	Diff line number	Diff line
		@@ -143,9 +143,9 @@ public:
		void setTransactionHangCallback(std::function<void(const std::string&)> callback);
		void setApplyToken(sp<IBinder>);

		void setWaitForBufferReleaseCallback(std::function<void()> callback)
		void setWaitForBufferReleaseCallback(std::function<void(const nsecs_t)> callback)
		EXCLUDES(mWaitForBufferReleaseMutex);
		std::function<void()> getWaitForBufferReleaseCallback() const
		std::function<void(const nsecs_t)> getWaitForBufferReleaseCallback() const
		EXCLUDES(mWaitForBufferReleaseMutex);

		virtual ~BLASTBufferQueue();
		@@ -329,7 +329,8 @@ private:

		std::unordered_set<uint64_t> mSyncedFrameNumbers GUARDED_BY(mMutex);

		std::function<void()> mWaitForBufferReleaseCallback GUARDED_BY(mWaitForBufferReleaseMutex);
		std::function<void(const nsecs_t)> mWaitForBufferReleaseCallback
		GUARDED_BY(mWaitForBufferReleaseMutex);
		#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(BUFFER_RELEASE_CHANNEL)
		// BufferReleaseChannel is used to communicate buffer releases from SurfaceFlinger to the
		// client.