diff options
| author | Kelly Rossmoyer <krossmo@google.com> | 2022-04-01 20:28:24 +0000 |
|---|---|---|
| committer | Kelly Rossmoyer <krossmo@google.com> | 2022-04-01 22:16:22 +0000 |
| commit | b7c5a147cddf57c5318d27ca9a11bd8e646a5bf2 (patch) | |
| tree | 65ba76c28f628faa9687f407f2d748db44bd622c /powerstats | |
| parent | 98ba4af1b45d37ebf9977b7e4a6ec3b3ace46e7e (diff) | |
| download | gs201-b7c5a147cddf57c5318d27ca9a11bd8e646a5bf2.tar.gz | |
Revert "powerstats: set time limit as timeout for AoC"
Revert "powerstats: timeout mechanism for AoC data provider"
Revert submission 17442015-powerstats-aoc-timeout
Reason for revert: Causes PowerStatsHAL crashes (b/227578192)
Reverted Changes:
I9a9eb27fa:powerstats: set time limit as timeout for AoC
Ib70000580:powerstats: timeout mechanism for AoC data provide...
Ied599054c:Revert "powerstats: disable AoC power stats report...
Iaf5af43eb:powerstats: set time limit as timeout for AoC
Change-Id: I6625c444a5f77ac5cfd2b152aa434461cfca7f7a
Diffstat (limited to 'powerstats')
| -rw-r--r-- | powerstats/Gs201CommonDataProviders.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp index 599874d..6232a6e 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/Gs201CommonDataProviders.cpp @@ -102,7 +102,6 @@ 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) @@ -115,7 +114,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, TIMEOUT_MILLIS)); + coreStates)); // Add AoC voltage stats std::vector<std::pair<std::string, std::string>> voltageIds = { @@ -126,8 +125,7 @@ void addAoC(std::shared_ptr<PowerStats> p) { {"UUD", "ultra_underdrive"}, {"UD", "underdrive"}}; p->addStateResidencyDataProvider( - std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates, - TIMEOUT_MILLIS)); + std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates)); // Add AoC monitor mode std::vector<std::pair<std::string, std::string>> monitorIds = { @@ -137,8 +135,7 @@ void addAoC(std::shared_ptr<PowerStats> p) { {"MON", "mode"}, }; p->addStateResidencyDataProvider( - std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates, - TIMEOUT_MILLIS)); + std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates)); // Add AoC restart count const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = { |