power/stats: Index the state residency data providers am: 3bad122962 am: 82a8c67415 (931e1e1d) · Commits · e / os / android_hardware_interfaces

power/stats/aidl/default/PowerStats.cpp

+8 −3

Original line number	Diff line number	Diff line
		@@ -32,15 +32,19 @@ void PowerStats::addStateResidencyDataProvider(std::unique_ptr<IStateResidencyDa
		}

		int32_t id = mPowerEntityInfos.size();
		auto info = p->getInfo();

		for (const auto& [entityName, states] : p->getInfo()) {
		size_t index = mStateResidencyDataProviders.size();
		mStateResidencyDataProviders.emplace_back(std::move(p));

		for (const auto& [entityName, states] : info) {
		PowerEntity i = {
		.id = id++,
		.name = entityName,
		.states = states,
		};
		mPowerEntityInfos.emplace_back(i);
		mStateResidencyDataProviders.emplace_back(std::move(p));
		mStateResidencyDataProviderIndex.emplace_back(index);
		}
		}

		@@ -92,7 +96,8 @@ ndk::ScopedAStatus PowerStats::getStateResidency(const std::vector<int32_t>& in_
		// Check to see if we already have data for the given id
		std::string powerEntityName = mPowerEntityInfos[id].name;
		if (stateResidencies.find(powerEntityName) == stateResidencies.end()) {
		mStateResidencyDataProviders[id]->getStateResidencies(&stateResidencies);
		mStateResidencyDataProviders.at(mStateResidencyDataProviderIndex.at(id))
		->getStateResidencies(&stateResidencies);
		}

		// Append results if we have them

+2 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,8 @@ class PowerStats : public BnPowerStats {
		private:
		std::vector<std::unique_ptr<IStateResidencyDataProvider>> mStateResidencyDataProviders;
		std::vector<PowerEntity> mPowerEntityInfos;
		/* Index that maps each power entity id to an entry in mStateResidencyDataProviders */
		std::vector<size_t> mStateResidencyDataProviderIndex;

		std::vector<std::unique_ptr<IEnergyConsumer>> mEnergyConsumers;
		std::vector<EnergyConsumer> mEnergyConsumerInfos;