Merge "SF: Remove static screen stats" (cc173698) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+0 −34

Original line number	Diff line number	Diff line
		@@ -2493,20 +2493,6 @@ void SurfaceFlinger::postComposition() {
		return;
		}

		if (mHasPoweredOff) {
		mHasPoweredOff = false;
		} else {
		const Duration elapsedTime = presentTime - getBE().mLastPresentTime;
		const size_t numPeriods = static_cast<size_t>(elapsedTime.ns() / vsyncPeriod.ns());
		if (numPeriods < SurfaceFlingerBE::NUM_BUCKETS - 1) {
		getBE().mFrameBuckets[numPeriods] += elapsedTime.ns();
		} else {
		getBE().mFrameBuckets[SurfaceFlingerBE::NUM_BUCKETS - 1] += elapsedTime.ns();
		}
		getBE().mTotalTime += elapsedTime.ns();
		}
		getBE().mLastPresentTime = presentTime;

		// Cleanup any outstanding resources due to rendering a prior frame.
		getRenderEngine().cleanupPostRender();

		@@ -4757,7 +4743,6 @@ void SurfaceFlinger::setPowerModeInternal(const sp<DisplayDevice>& display, hal:
		}

		mVisibleRegionsDirty = true;
		mHasPoweredOff = true;
		scheduleComposite(FrameHint::kActive);
		} else if (mode == hal::PowerMode::OFF) {
		// Turn off the display
		@@ -4847,7 +4832,6 @@ status_t SurfaceFlinger::doDump(int fd, const DumpArgs& args, bool asProto) {
		{"--latency-clear"s, argsDumper(&SurfaceFlinger::clearStatsLocked)},
		{"--list"s, dumper(&SurfaceFlinger::listLayersLocked)},
		{"--planner"s, argsDumper(&SurfaceFlinger::dumpPlannerInfo)},
		{"--static-screen"s, dumper(&SurfaceFlinger::dumpStaticScreenStats)},
		{"--timestats"s, protoDumper(&SurfaceFlinger::dumpTimeStats)},
		{"--vsync"s, dumper(&SurfaceFlinger::dumpVSync)},
		{"--wide-color"s, dumper(&SurfaceFlinger::dumpWideColorInfo)},
		@@ -4990,21 +4974,6 @@ void SurfaceFlinger::dumpPlannerInfo(const DumpArgs& args, std::string& result)
		}
		}

		void SurfaceFlinger::dumpStaticScreenStats(std::string& result) const {
		result.append("Static screen stats:\n");
		for (size_t b = 0; b < SurfaceFlingerBE::NUM_BUCKETS - 1; ++b) {
		float bucketTimeSec = getBE().mFrameBuckets[b] / 1e9;
		float percent = 100.0f *
		static_cast<float>(getBE().mFrameBuckets[b]) / getBE().mTotalTime;
		StringAppendF(&result, " < %zd frames: %.3f s (%.1f%%)\n", b + 1, bucketTimeSec, percent);
		}
		float bucketTimeSec = getBE().mFrameBuckets[SurfaceFlingerBE::NUM_BUCKETS - 1] / 1e9;
		float percent = 100.0f *
		static_cast<float>(getBE().mFrameBuckets[SurfaceFlingerBE::NUM_BUCKETS - 1]) / getBE().mTotalTime;
		StringAppendF(&result, " %zd+ frames: %.3f s (%.1f%%)\n", SurfaceFlingerBE::NUM_BUCKETS - 1,
		bucketTimeSec, percent);
		}

		void SurfaceFlinger::dumpCompositionDisplays(std::string& result) const {
		for (const auto& [token, display] : mDisplays) {
		display->getCompositionDisplay()->dump(result);
		@@ -5200,9 +5169,6 @@ void SurfaceFlinger::dumpAllLocked(const DumpArgs& args, std::string& result) co
		dumpVSync(result);
		result.append("\n");

		dumpStaticScreenStats(result);
		result.append("\n");

		StringAppendF(&result, "Total missed frame count: %u\n", mFrameMissedCount.load());
		StringAppendF(&result, "HWC missed frame count: %u\n", mHwcFrameMissedCount.load());
		StringAppendF(&result, "GPU missed frame count: %u\n\n", mGpuFrameMissedCount.load());

services/surfaceflinger/SurfaceFlinger.h

+0 −19

Original line number	Diff line number	Diff line
		@@ -171,13 +171,6 @@ enum class LatchUnsignaledConfig {

		using DisplayColorSetting = compositionengine::OutputColorSetting;

		struct SurfaceFlingerBE {
		static const size_t NUM_BUCKETS = 8; // < 1-7, 7+
		nsecs_t mFrameBuckets[NUM_BUCKETS] = {};
		nsecs_t mTotalTime = 0;
		TimePoint mLastPresentTime;
		};

		class SurfaceFlinger : public BnSurfaceComposer,
		public PriorityDumper,
		private IBinder::DeathRecipient,
		@@ -251,9 +244,6 @@ public:
		// starts SurfaceFlinger main loop in the current thread
		void run() ANDROID_API;

		SurfaceFlingerBE& getBE() { return mBE; }
		const SurfaceFlingerBE& getBE() const { return mBE; }

		// Indicates frame activity, i.e. whether commit and/or composite is taking place.
		enum class FrameHint { kNone, kActive };

		@@ -1016,7 +1006,6 @@ private:
		void logFrameStats(TimePoint now) REQUIRES(kMainThreadContext);

		void dumpVSync(std::string& result) const REQUIRES(mStateLock);
		void dumpStaticScreenStats(std::string& result) const;

		void dumpCompositionDisplays(std::string& result) const REQUIRES(mStateLock);
		void dumpDisplays(std::string& result) const REQUIRES(mStateLock);
		@@ -1215,13 +1204,6 @@ private:
		mPendingTransactionQueues;
		LocklessQueue<TransactionState> mLocklessTransactionQueue;
		std::atomic<size_t> mPendingTransactionCount = 0;
		/*
		* Feature prototyping
		*/

		// Static screen stats
		bool mHasPoweredOff = false;

		std::atomic<size_t> mNumLayers = 0;

		// to linkToDeath
		@@ -1249,7 +1231,6 @@ private:
		ui::Dataspace mColorSpaceAgnosticDataspace;
		float mDimmingRatio = -1.f;

		SurfaceFlingerBE mBE;
		std::unique_ptr<compositionengine::CompositionEngine> mCompositionEngine;
		// mMaxRenderTargetSize is only set once in init() so it doesn't need to be protected by
		// any mutex.

services/surfaceflinger/fuzzer/surfaceflinger_fuzzers_utils.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -444,9 +444,6 @@ public:
		result = fdp->ConsumeRandomLengthString().c_str();
		mFlinger->dumpFrameTimeline(dumpArgs, result);

		result = fdp->ConsumeRandomLengthString().c_str();
		mFlinger->dumpStaticScreenStats(result);

		result = fdp->ConsumeRandomLengthString().c_str();
		mFlinger->dumpRawDisplayIdentificationData(dumpArgs, result);

services/surfaceflinger/tests/unittests/SurfaceFlinger_SetPowerModeInternalTest.cpp

+0 −2

Original line number	Diff line number	Diff line
		@@ -140,7 +140,6 @@ struct TransitionOffToOnVariant : public TransitionVariantCommon<PowerMode::OFF,

		static void verifyPostconditions(DisplayTransactionTest* test) {
		EXPECT_TRUE(test->mFlinger.getVisibleRegionsDirty());
		EXPECT_TRUE(test->mFlinger.getHasPoweredOff());
		}
		};

		@@ -155,7 +154,6 @@ struct TransitionOffToDozeSuspendVariant

		static void verifyPostconditions(DisplayTransactionTest* test) {
		EXPECT_TRUE(test->mFlinger.getVisibleRegionsDirty());
		EXPECT_TRUE(test->mFlinger.getHasPoweredOff());
		}
		};

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -476,7 +476,6 @@ public:
		* Read-only access to private data to assert post-conditions.
		*/

		const auto& getHasPoweredOff() const { return mFlinger->mHasPoweredOff; }
		const auto& getVisibleRegionsDirty() const { return mFlinger->mVisibleRegionsDirty; }
		auto& getHwComposer() const {
		return static_cast<impl::HWComposer&>(mFlinger->getHwComposer());