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

Revert "Use libaoc to provide consistent timestamp calculations"

Browse Source 
Revert "Allow libaoc to be used in more contexts"

Revert submission 18605412-b-233923713

Reason for revert: Completely broke master-without-vendor

Bug: 235533674

Reverted Changes:
Iacd541815:Use libaoc to provide consistent timestamp calcula...
Id31ee3439:Allow libaoc to be used in more contexts

Change-Id: I3345d0e4baa8d5dce22be20f0213ad1421ce1a90
This commit is contained in:
Sam Dubey 2022-06-10 03:23:56 +00:00
parent 9f4ac2c565
commit 33552445b8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
powerstats/Android.bp
View File

@ -20,6 +20,5 @@ cc_library {
shared_libs: [ shared_libs: [
"android.hardware.power.stats-impl.pixel", "android.hardware.power.stats-impl.pixel",
"libaoc",
], ],
} }

9
powerstats/AocStateResidencyDataProvider.cpp
View File

@ -18,8 +18,6 @@
#include <android-base/logging.h> #include <android-base/logging.h>
#include <aoc.h>
namespace aidl { namespace aidl {
namespace android { namespace android {
namespace hardware { namespace hardware {
@ -28,8 +26,11 @@ namespace stats {
AocStateResidencyDataProvider::AocStateResidencyDataProvider(std::vector<std::pair<std::string, AocStateResidencyDataProvider::AocStateResidencyDataProvider(std::vector<std::pair<std::string,
std::string>> ids, std::vector<std::pair<std::string, std::string>> states) { std::string>> ids, std::vector<std::pair<std::string, std::string>> states) {
// AoC stats are reported in ticks // AoC stats are reported in ticks of 244.140625ns. The transform
std::function<uint64_t(uint64_t)> aocTickToMs = [](uint64_t a) { return aoc_ticks_to_nanoseconds(a) / 1000000; }; // function converts ticks to milliseconds.
// 1000000 / 244.140625 = 4096.
static const uint64_t AOC_CLK = 4096;
std::function<uint64_t(uint64_t)> aocTickToMs = [](uint64_t a) { return a / AOC_CLK; };
GenericStateResidencyDataProvider::StateResidencyConfig config = { GenericStateResidencyDataProvider::StateResidencyConfig config = {
.entryCountSupported = true, .entryCountSupported = true,
.entryCountPrefix = "Counter:", .entryCountPrefix = "Counter:",