diff options
| author | Darren Hsu <darrenhsu@google.com> | 2022-03-28 16:11:19 +0800 |
|---|---|---|
| committer | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-30 08:05:25 +0000 |
| commit | 6f41cc87c833443725186a5831dc043604c391a9 (patch) | |
| tree | ef310af75c40c177264978ca022b69b398d0b895 /powerstats | |
| parent | 6f00cd7be1ccddc61a9d584d6153d62023699cdb (diff) | |
| download | gs201-6f41cc87c833443725186a5831dc043604c391a9.tar.gz | |
powerstats: set time limit as timeout for AoC
Bug: 219630658
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: Iaf5af43ebcda4edb0ff5f88e3ba82dda2d0c51a5
Signed-off-by: Darren Hsu <darrenhsu@google.com>
Diffstat (limited to 'powerstats')
| -rw-r--r-- | powerstats/Gs201CommonDataProviders.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp index 6232a6e..599874d 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/Gs201CommonDataProviders.cpp @@ -102,6 +102,7 @@ void addPlaceholderEnergyConsumers(std::shared_ptr<PowerStats> p) { } void addAoC(std::shared_ptr<PowerStats> p) { + static const uint64_t TIMEOUT_MILLIS = 120; std::string prefix = "/sys/devices/platform/19000000.aoc/control/"; // Add AoC cores (a32, ff1, hf0, and hf1) @@ -114,7 +115,7 @@ void addAoC(std::shared_ptr<PowerStats> p) { std::vector<std::pair<std::string, std::string>> coreStates = { {"DWN", "off"}, {"RET", "retention"}, {"WFI", "wfi"}}; p->addStateResidencyDataProvider(std::make_unique<AocStateResidencyDataProvider>(coreIds, - coreStates)); + coreStates, TIMEOUT_MILLIS)); // Add AoC voltage stats std::vector<std::pair<std::string, std::string>> voltageIds = { @@ -125,7 +126,8 @@ void addAoC(std::shared_ptr<PowerStats> p) { {"UUD", "ultra_underdrive"}, {"UD", "underdrive"}}; p->addStateResidencyDataProvider( - std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates)); + std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates, + TIMEOUT_MILLIS)); // Add AoC monitor mode std::vector<std::pair<std::string, std::string>> monitorIds = { @@ -135,7 +137,8 @@ void addAoC(std::shared_ptr<PowerStats> p) { {"MON", "mode"}, }; p->addStateResidencyDataProvider( - std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates)); + std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates, + TIMEOUT_MILLIS)); // Add AoC restart count const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = { |