From 226ee1307528e7970b6ccb0e21fa2b7ab605860b Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Wed, 2 Nov 2022 09:16:00 +0800 Subject: [PATCH 1/2] powerstats: update core stats state residency Bug: 244519855 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: Id83074079bade4f6a3aace25b513ccc99a255fb1 Signed-off-by: Darren Hsu --- powerstats/ZumaCommonDataProviders.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/powerstats/ZumaCommonDataProviders.cpp b/powerstats/ZumaCommonDataProviders.cpp index 8fbb63c1..dfac6d0c 100644 --- a/powerstats/ZumaCommonDataProviders.cpp +++ b/powerstats/ZumaCommonDataProviders.cpp @@ -349,8 +349,19 @@ void addCPUclusters(std::shared_ptr p) { }; std::vector cfgs; - for (std::string name : {"CORE00", "CORE01", "CORE02", "CORE03", "CORE10", "CORE11", - "CORE20", "CORE21", "CLUSTER0", "CLUSTER1", "CLUSTER2"}) { + for (std::string name : { + "CORE00", + "CORE01", + "CORE02", + "CORE03", + "CORE10", + "CORE11", + "CORE12", + "CORE13", + "CORE21", + "CLUSTER0", + "CLUSTER1", + "CLUSTER2"}) { cfgs.emplace_back(generateGenericStateResidencyConfigs(cpuStateConfig, cpuStateHeaders), name, name); } From 5a69d9ee33ff4ffffca31f27c6bd3da295152576 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Wed, 2 Nov 2022 10:23:51 +0800 Subject: [PATCH 2/2] powerstats: expose common data provider methods Bug: 256942114 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: I41afe01aea5d2e816218540a1a14e2e2519b65f7 Signed-off-by: Darren Hsu --- powerstats/include/ZumaCommonDataProviders.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/powerstats/include/ZumaCommonDataProviders.h b/powerstats/include/ZumaCommonDataProviders.h index 15b8050f..054e422e 100644 --- a/powerstats/include/ZumaCommonDataProviders.h +++ b/powerstats/include/ZumaCommonDataProviders.h @@ -20,6 +20,20 @@ using aidl::android::hardware::power::stats::PowerStats; -void addZumaCommonDataProviders(std::shared_ptr p); - +void addAoC(std::shared_ptr p); +void addCPUclusters(std::shared_ptr p); +void addDevfreq(std::shared_ptr p); +void addDvfsStats(std::shared_ptr p); +void addGNSS(std::shared_ptr p); +void addGPU(std::shared_ptr p); +void addMobileRadio(std::shared_ptr p); void addNFC(std::shared_ptr p, const std::string& path); +void addPCIe(std::shared_ptr p); +void addPixelStateResidencyDataProvider(std::shared_ptr p); +void addPowerDomains(std::shared_ptr p); +void addSoC(std::shared_ptr p); +void addTPU(std::shared_ptr p); +void addUfs(std::shared_ptr p); +void addWifi(std::shared_ptr p); +void addZumaCommonDataProviders(std::shared_ptr p); +void setEnergyMeter(std::shared_ptr p);