Snap for 6707956 from 80606cba23cb3d5adfbd39e43ec041f312f1a395 to rvc-qpr1-release (9f368283) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/BufferQueueLayer.cpp

+12 −7

Original line number	Diff line number	Diff line
		@@ -324,9 +324,6 @@ status_t BufferQueueLayer::updateTexImage(bool& recomputeVisibleRegions, nsecs_t
		}

		uint64_t bufferID = mQueueItems[0].mGraphicBuffer->getId();
		mFlinger->mFrameTracer->traceFence(layerId, bufferID, currentFrameNumber,
		mQueueItems[0].mFenceTime,
		FrameTracer::FrameEvent::ACQUIRE_FENCE);
		mFlinger->mTimeStats->setLatchTime(layerId, currentFrameNumber, latchTime);
		mFlinger->mFrameTracer->traceTimestamp(layerId, bufferID, currentFrameNumber, latchTime,
		FrameTracer::FrameEvent::LATCH);
		@@ -393,8 +390,12 @@ void BufferQueueLayer::onFrameCancelled(const uint64_t bufferId) {

		void BufferQueueLayer::onFrameAvailable(const BufferItem& item) {
		const int32_t layerId = getSequence();
		mFlinger->mFrameTracer->traceTimestamp(layerId, item.mGraphicBuffer->getId(), item.mFrameNumber,
		systemTime(), FrameTracer::FrameEvent::QUEUE);
		const uint64_t bufferId = item.mGraphicBuffer->getId();
		mFlinger->mFrameTracer->traceTimestamp(layerId, bufferId, item.mFrameNumber, systemTime(),
		FrameTracer::FrameEvent::QUEUE);
		mFlinger->mFrameTracer->traceFence(layerId, bufferId, item.mFrameNumber,
		std::make_shared<FenceTime>(item.mFence),
		FrameTracer::FrameEvent::ACQUIRE_FENCE);

		ATRACE_CALL();
		// Add this buffer from our internal queue tracker
		@@ -460,8 +461,12 @@ void BufferQueueLayer::onFrameReplaced(const BufferItem& item) {
		}

		const int32_t layerId = getSequence();
		mFlinger->mFrameTracer->traceTimestamp(layerId, item.mGraphicBuffer->getId(), item.mFrameNumber,
		systemTime(), FrameTracer::FrameEvent::QUEUE);
		const uint64_t bufferId = item.mGraphicBuffer->getId();
		mFlinger->mFrameTracer->traceTimestamp(layerId, bufferId, item.mFrameNumber, systemTime(),
		FrameTracer::FrameEvent::QUEUE);
		mFlinger->mFrameTracer->traceFence(layerId, bufferId, item.mFrameNumber,
		std::make_shared<FenceTime>(item.mFence),
		FrameTracer::FrameEvent::ACQUIRE_FENCE);
		mConsumer->onBufferAvailable(item);
		}

services/surfaceflinger/Scheduler/VSyncDispatchTimerQueue.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -243,7 +243,8 @@ void VSyncDispatchTimerQueue::timerCallback() {
		std::vector<Invocation> invocations;
		{
		std::lock_guard<decltype(mMutex)> lk(mMutex);
		mLastTimerCallback = mTimeKeeper->now();
		auto const now = mTimeKeeper->now();
		mLastTimerCallback = now;
		for (auto it = mCallbacks.begin(); it != mCallbacks.end(); it++) {
		auto& callback = it->second;
		auto const wakeupTime = callback->wakeupTime();
		@@ -251,7 +252,8 @@ void VSyncDispatchTimerQueue::timerCallback() {
		continue;
		}

		if (*wakeupTime < mIntendedWakeupTime + mTimerSlack) {
		auto const lagAllowance = std::max(now - mIntendedWakeupTime, static_cast<nsecs_t>(0));
		if (*wakeupTime < mIntendedWakeupTime + mTimerSlack + lagAllowance) {
		callback->executing();
		invocations.emplace_back(
		Invocation{callback, callback->lastExecutedVsyncTarget(), wakeupTime});

services/surfaceflinger/tests/unittests/VSyncDispatchTimerQueueTest.cpp

+30 −1

Original line number	Diff line number	Diff line
		@@ -115,11 +115,15 @@ public:

		operator VSyncDispatch::CallbackToken() const { return mToken; }

		void counter(nsecs_t time, nsecs_t) { mCalls.push_back(time); }
		void counter(nsecs_t time, nsecs_t wakeup_time) {
		mCalls.push_back(time);
		mWakeupTime.push_back(wakeup_time);
		}

		VSyncDispatch& mDispatch;
		VSyncDispatch::CallbackToken mToken;
		std::vector<nsecs_t> mCalls;
		std::vector<nsecs_t> mWakeupTime;
		};

		class PausingCallback {
		@@ -747,6 +751,31 @@ TEST_F(VSyncDispatchTimerQueueTest, rearmsWhenCancelledAndIsNextScheduled) {
		EXPECT_THAT(cb2.mCalls.size(), Eq(1));
		}

		TEST_F(VSyncDispatchTimerQueueTest, laggedTimerGroupsCallbacksWithinLag) {
		CountingCallback cb1(mDispatch);
		CountingCallback cb2(mDispatch);

		Sequence seq;
		EXPECT_CALL(mStubTracker, nextAnticipatedVSyncTimeFrom(1000))
		.InSequence(seq)
		.WillOnce(Return(1000));
		EXPECT_CALL(mMockClock, alarmIn(_, 600)).InSequence(seq);
		EXPECT_CALL(mStubTracker, nextAnticipatedVSyncTimeFrom(1000))
		.InSequence(seq)
		.WillOnce(Return(1000));

		EXPECT_EQ(mDispatch.schedule(cb1, 400, 1000), ScheduleResult::Scheduled);
		EXPECT_EQ(mDispatch.schedule(cb2, 390, 1000), ScheduleResult::Scheduled);

		mMockClock.setLag(100);
		mMockClock.advanceBy(700);

		ASSERT_THAT(cb1.mWakeupTime.size(), Eq(1));
		EXPECT_THAT(cb1.mWakeupTime[0], Eq(600));
		ASSERT_THAT(cb2.mWakeupTime.size(), Eq(1));
		EXPECT_THAT(cb2.mWakeupTime[0], Eq(610));
		}

		class VSyncDispatchTimerQueueEntryTest : public testing::Test {
		protected:
		nsecs_t const mPeriod = 1000;