From e3e46d4de94a9732f3beb3128197ed88e1f63467 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Fri, 22 Dec 2023 23:34:42 +0800 Subject: [PATCH] powerstats: sort frequencies in descending order Cpufreq data is sorted in ascending order, but power stats are sorted in descending order. Reverse sorting to maintain consistency with other power stats. Bug: 317429309 Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest Change-Id: I29a58c02add846eb66a8d6eb247336111363c335 Signed-off-by: Darren Hsu --- powerstats/AdaptiveDvfsStateResidencyDataProvider.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/powerstats/AdaptiveDvfsStateResidencyDataProvider.cpp b/powerstats/AdaptiveDvfsStateResidencyDataProvider.cpp index 6e377aa..c842d3e 100644 --- a/powerstats/AdaptiveDvfsStateResidencyDataProvider.cpp +++ b/powerstats/AdaptiveDvfsStateResidencyDataProvider.cpp @@ -62,6 +62,14 @@ AdaptiveDvfsStateResidencyDataProvider::AdaptiveDvfsStateResidencyDataProvider( } } + // Cpufreq data is sorted in ascending order, but power stats are sorted + // in descending order. Reverse sorting to maintain consistency with + // other power stats. + if (states.size() > 1 && + std::atoll(states[0].second.c_str()) < std::atoll(states[1].second.c_str())) { + std::reverse(states.begin(), states.end()); + } + mPowerEntities.push_back({powerEntities[i].first, std::move(states)}); }