powerstats: include sleep duration for core down state
Bug: 263276734
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: Ia9c1ed8c7ca68d03e73da35674ac299d7cf22045
Signed-off-by: Darren Hsu <darrenhsu@google.com>
diff --git a/powerstats/CpupmStateResidencyDataProvider.cpp b/powerstats/CpupmStateResidencyDataProvider.cpp
index c963f78..2adae54 100644
--- a/powerstats/CpupmStateResidencyDataProvider.cpp
+++ b/powerstats/CpupmStateResidencyDataProvider.cpp
@@ -34,8 +34,14 @@
namespace stats {
CpupmStateResidencyDataProvider::CpupmStateResidencyDataProvider(
- const std::string &path, const Config &config)
- : mPath(std::move(path)), mConfig(std::move(config)) {}
+ const std::string &path,
+ const Config &config,
+ const std::string &sleepPath,
+ const SleepConfig &sleepConfig)
+ : mPath(std::move(path)),
+ mConfig(std::move(config)),
+ mSleepPath(std::move(sleepPath)),
+ mSleepConfig(std::move(sleepConfig)) {}
int32_t CpupmStateResidencyDataProvider::matchState(char const *line) {
for (int32_t i = 0; i < mConfig.states.size(); i++) {
@@ -78,6 +84,12 @@
return false;
}
+ std::unique_ptr<FILE, decltype(&fclose)> sleepFp(fopen(mSleepPath.c_str(), "r"), fclose);
+ if (!sleepFp) {
+ PLOG(ERROR) << __func__ << ":Failed to open file " << mSleepPath;
+ return false;
+ }
+
for (int32_t i = 0; i < mConfig.entities.size(); i++) {
std::vector<StateResidency> stateResidencies(mConfig.states.size());
for (int32_t j = 0; j < stateResidencies.size(); j++) {
@@ -90,9 +102,29 @@
char *line = nullptr;
int32_t temp, entityIndex, stateId = -1;
- uint64_t duration, count;
+ uint64_t duration, count, sleepDurationMs = 0;
auto it = residencies->end();
+ int32_t sleepIndex = 0;
+ // Parse state for sleep duration
+ while (getline(&line, &len, sleepFp.get()) != -1) {
+ std::string trimedLine = Trim(std::string(line));
+ if (StartsWith(trimedLine, mSleepConfig[sleepIndex])) {
+ if (sleepIndex < mSleepConfig.size() - 1) {
+ sleepIndex++;
+ continue;
+ } else {
+ std::vector<std::string> parts = Split(trimedLine, " ");
+ if (parts.size() == 2) {
+ ParseUint(parts[1], &sleepDurationMs);
+ sleepDurationMs /= NS_TO_MS;
+ }
+ break;
+ }
+ }
+ }
+
+ // Parse state for CPUPM entities
while (getline(&line, &len, fp.get()) != -1) {
temp = matchState(line);
// Assign new id only when a new valid state is encountered.
@@ -109,7 +141,7 @@
it = residencies->find(mConfig.entities[entityIndex].first);
if (it != residencies->end()) {
if (parseState(line, &duration, &count)) {
- it->second[stateId].totalTimeInStateMs = duration / US_TO_MS;
+ it->second[stateId].totalTimeInStateMs = duration / US_TO_MS + sleepDurationMs;
it->second[stateId].totalStateEntryCount = count;
} else {
LOG(ERROR) << "Failed to parse duration and count from [" << std::string(line)
diff --git a/powerstats/include/CpupmStateResidencyDataProvider.h b/powerstats/include/CpupmStateResidencyDataProvider.h
index c04e11e..be8ee46 100644
--- a/powerstats/include/CpupmStateResidencyDataProvider.h
+++ b/powerstats/include/CpupmStateResidencyDataProvider.h
@@ -34,10 +34,16 @@
std::vector<std::pair<std::string, std::string>> states;
};
+ typedef std::vector<std::string> SleepConfig;
+
/*
* path - path to cpupm sysfs node.
*/
- CpupmStateResidencyDataProvider(const std::string &path, const Config &config);
+ CpupmStateResidencyDataProvider(
+ const std::string &path,
+ const Config &config,
+ const std::string &sleepPath,
+ const SleepConfig &sleepConfig);
~CpupmStateResidencyDataProvider() = default;
/*
@@ -58,9 +64,13 @@
// A constant to represent the number of microseconds in one millisecond.
const uint64_t US_TO_MS = 1000;
+ // A constant to represent the number of nanoseconds in one millisecond.
+ const uint64_t NS_TO_MS = 1000000;
const std::string mPath;
const Config mConfig;
+ const std::string mSleepPath;
+ const SleepConfig mSleepConfig;
};
} // namespace stats