Merge "SF: dump planner layers in dumpsys" into sc-dev am: 2fff07da7c (a8160037) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/Flattener.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -49,6 +49,7 @@ public:
	const OutputCompositionState& outputState);		const OutputCompositionState& outputState);

	void dump(std::string& result) const;		void dump(std::string& result) const;
			void dumpLayers(std::string& result) const;

	private:		private:
	size_t calculateDisplayCost(const std::vector<const LayerState*>& layers) const;		size_t calculateDisplayCost(const std::vector<const LayerState*>& layers) const;

+9 −5

Original line number	Original line	Diff line number	Diff line
	@@ -96,6 +96,14 @@ void Flattener::renderCachedSets(renderengine::RenderEngine& renderEngine,
	mNewCachedSet->render(renderEngine, outputState);		mNewCachedSet->render(renderEngine, outputState);
	}		}

			void Flattener::dumpLayers(std::string& result) const {
			result.append(" Current layers:");
			for (const CachedSet& layer : mLayers) {
			result.append("\n");
			layer.dump(result);
			}
			}

	void Flattener::dump(std::string& result) const {		void Flattener::dump(std::string& result) const {
	const auto now = std::chrono::steady_clock::now();		const auto now = std::chrono::steady_clock::now();

	@@ -140,11 +148,7 @@ void Flattener::dump(std::string& result) const {
	base::StringAppendF(&result, "\n Current hash %016zx, last update %sago\n\n", mCurrentGeometry,		base::StringAppendF(&result, "\n Current hash %016zx, last update %sago\n\n", mCurrentGeometry,
	durationString(lastUpdate).c_str());		durationString(lastUpdate).c_str());

	result.append(" Current layers:");		dumpLayers(result);
	for (const CachedSet& layer : mLayers) {
	result.append("\n");
	layer.dump(result);
	}
	}		}

	size_t Flattener::calculateDisplayCost(const std::vector<const LayerState*>& layers) const {		size_t Flattener::calculateDisplayCost(const std::vector<const LayerState*>& layers) const {

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -233,6 +233,8 @@ void Planner::dump(const Vector<String16>& args, std::string& result) {
	}		}

	mPredictor.listSimilarStacks(*plan, result);		mPredictor.listSimilarStacks(*plan, result);
			} else if (command == "--layers" \|\| command == "-l") {
			mFlattener.dumpLayers(result);
	} else {		} else {
	base::StringAppendF(&result, "Unknown command '%s'\n\n", command.string());		base::StringAppendF(&result, "Unknown command '%s'\n\n", command.string());
	dumpUsage(result);		dumpUsage(result);
	@@ -268,6 +270,9 @@ void Planner::dumpUsage(std::string& result) const {

	result.append("[--similar\|-s] <plan>\n");		result.append("[--similar\|-s] <plan>\n");
	result.append(" Prints the example layer names for similar stacks matching <plan>\n");		result.append(" Prints the example layer names for similar stacks matching <plan>\n");

			result.append("[--layers\|-l]\n");
			result.append(" Prints the current layers\n");
	}		}

	} // namespace android::compositionengine::impl::planner		} // namespace android::compositionengine::impl::planner

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4987,6 +4987,13 @@ void SurfaceFlinger::dumpAllLocked(const DumpArgs& args, std::string& result) co
	result.append("\n");		result.append("\n");
	}		}

			{
			DumpArgs plannerArgs;
			plannerArgs.add(); // first argument is ignored
			plannerArgs.add(String16("--layers"));
			dumpPlannerInfo(plannerArgs, result);
			}

	/*		/*
	* Dump HWComposer state		* Dump HWComposer state
	*/		*/