drgreen/android_device_google_gs-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerstats: add new parameter to provide aoc clock am: 2756ac31ff am: 46a9f0ac04

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/18966586

Change-Id: I54761bf9a3af8761fe680eea41077f8401fe9072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Darren Hsu 2022-06-21 04:26:44 +00:00 committed by Automerger Merge Worker
commit af4ed69699
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
powerstats/AocStateResidencyDataProvider.cpp
View File

@ -24,12 +24,12 @@ namespace hardware {
namespace power { namespace power {
namespace stats { namespace stats {
AocStateResidencyDataProvider::AocStateResidencyDataProvider(std::vector<std::pair<std::string, AocStateResidencyDataProvider::AocStateResidencyDataProvider(
std::string>> ids, std::vector<std::pair<std::string, std::string>> states) { std::vector<std::pair<std::string, std::string>> ids,
// AoC stats are reported in ticks of 244.140625ns. The transform std::vector<std::pair<std::string, std::string>> states,
// function converts ticks to milliseconds. const uint64_t aocClock) {
// 1000000 / 244.140625 = 4096. // AoC stats are reported in ticks.
static const uint64_t AOC_CLK = 4096; static const uint64_t AOC_CLK = aocClock;
std::function<uint64_t(uint64_t)> aocTickToMs = [](uint64_t a) { return a / AOC_CLK; }; std::function<uint64_t(uint64_t)> aocTickToMs = [](uint64_t a) { return a / AOC_CLK; };
GenericStateResidencyDataProvider::StateResidencyConfig config = { GenericStateResidencyDataProvider::StateResidencyConfig config = {
.entryCountSupported = true, .entryCountSupported = true,

5
powerstats/AocTimedStateResidencyDataProvider.cpp
View File

@ -28,8 +28,9 @@ namespace stats {
AocTimedStateResidencyDataProvider::AocTimedStateResidencyDataProvider( AocTimedStateResidencyDataProvider::AocTimedStateResidencyDataProvider(
std::vector<std::pair<std::string, std::string>> ids, std::vector<std::pair<std::string, std::string>> ids,
std::vector<std::pair<std::string, std::string>> states, std::vector<std::pair<std::string, std::string>> states,
const uint64_t timeoutMillis) const uint64_t timeoutMillis,
: AocStateResidencyDataProvider(ids, states) { const uint64_t aocClock)
: AocStateResidencyDataProvider(ids, states, aocClock) {
static const uint64_t DEFAULT_MAX_TIME_PER_STATE_MILLIS = 120; static const uint64_t DEFAULT_MAX_TIME_PER_STATE_MILLIS = 120;
mTimeoutMillis = mTimeoutMillis =

3
powerstats/include/AocStateResidencyDataProvider.h
View File

@ -27,7 +27,8 @@ namespace stats {
class AocStateResidencyDataProvider : public PowerStats::IStateResidencyDataProvider { class AocStateResidencyDataProvider : public PowerStats::IStateResidencyDataProvider {
public: public:
AocStateResidencyDataProvider(std::vector<std::pair<std::string, std::string>> ids, AocStateResidencyDataProvider(std::vector<std::pair<std::string, std::string>> ids,
std::vector<std::pair<std::string, std::string>> states); std::vector<std::pair<std::string, std::string>> states,
const uint64_t aocClock);
~AocStateResidencyDataProvider() = default; ~AocStateResidencyDataProvider() = default;
bool getStateResidencies( bool getStateResidencies(
std::unordered_map<std::string, std::vector<StateResidency>> *residencies) override; std::unordered_map<std::string, std::vector<StateResidency>> *residencies) override;

3
powerstats/include/AocTimedStateResidencyDataProvider.h
View File

@ -39,7 +39,8 @@ class AocTimedStateResidencyDataProvider : public AocStateResidencyDataProvider
AocTimedStateResidencyDataProvider( AocTimedStateResidencyDataProvider(
std::vector<std::pair<std::string, std::string>> ids, std::vector<std::pair<std::string, std::string>> ids,
std::vector<std::pair<std::string, std::string>> states, std::vector<std::pair<std::string, std::string>> states,
const uint64_t timeoutMillis); const uint64_t timeoutMillis,
const uint64_t aocClock);
~AocTimedStateResidencyDataProvider() = default; ~AocTimedStateResidencyDataProvider() = default;
bool getStateResidencies( bool getStateResidencies(