Merge "SF: trace adjusted expected vsync time" into sc-dev (40c89dd0) · Commits · e / os / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+7 −8

Original line number	Diff line number	Diff line
		@@ -1741,12 +1741,6 @@ nsecs_t SurfaceFlinger::calculateExpectedPresentTime(DisplayStatInfo stats) cons
		}

		void SurfaceFlinger::onMessageReceived(int32_t what, int64_t vsyncId, nsecs_t expectedVSyncTime) {
		const auto vsyncIn = [&] {
		if (!ATRACE_ENABLED()) return 0.f;
		return (expectedVSyncTime - systemTime()) / 1e6f;
		}();

		ATRACE_FORMAT("onMessageReceived %" PRId64 " vsyncIn %.2fms", vsyncId, vsyncIn);
		switch (what) {
		case MessageQueue::INVALIDATE: {
		onMessageInvalidate(vsyncId, expectedVSyncTime);
		@@ -1760,8 +1754,6 @@ void SurfaceFlinger::onMessageReceived(int32_t what, int64_t vsyncId, nsecs_t ex
		}

		void SurfaceFlinger::onMessageInvalidate(int64_t vsyncId, nsecs_t expectedVSyncTime) {
		ATRACE_CALL();

		const nsecs_t frameStart = systemTime();
		// calculate the expected present time once and use the cached
		// value throughout this frame to make sure all layers are
		@@ -1776,6 +1768,13 @@ void SurfaceFlinger::onMessageInvalidate(int64_t vsyncId, nsecs_t expectedVSyncT
		const nsecs_t lastScheduledPresentTime = mScheduledPresentTime;
		mScheduledPresentTime = expectedVSyncTime;

		const auto vsyncIn = [&] {
		if (!ATRACE_ENABLED()) return 0.f;
		return (mExpectedPresentTime - systemTime()) / 1e6f;
		}();
		ATRACE_FORMAT("onMessageInvalidate %" PRId64 " vsyncIn %.2fms%s", vsyncId, vsyncIn,
		mExpectedPresentTime == expectedVSyncTime ? "" : " (adjusted)");

		// When Backpressure propagation is enabled we want to give a small grace period
		// for the present fence to fire instead of just giving up on this frame to handle cases
		// where present fence is just about to get signaled.