Merge "power.stats: Only access debugfs for userdebug builds" into qt-dev

am: 55fc5d01e7

Change-Id: If590efcb799fdc7e30508c3e9561d1dada01d648
This commit is contained in:
Benjamin Schwartz
2019-04-12 13:46:00 -07:00
committed by android-build-merger

View File

@@ -16,6 +16,7 @@
#define LOG_TAG "android.hardware.power.stats@1.0-service.pixel" #define LOG_TAG "android.hardware.power.stats@1.0-service.pixel"
#include <android-base/properties.h>
#include <android/log.h> #include <android/log.h>
#include <binder/IPCThreadState.h> #include <binder/IPCThreadState.h>
#include <binder/IServiceManager.h> #include <binder/IServiceManager.h>
@@ -56,67 +57,71 @@ using android::device::google::wahoo::powerstats::EaselStateResidencyDataProvide
int main(int /* argc */, char ** /* argv */) { int main(int /* argc */, char ** /* argv */) {
ALOGI("power.stats service 1.0 is starting."); ALOGI("power.stats service 1.0 is starting.");
bool isDebuggable = android::base::GetBoolProperty("ro.debuggable", false);
PowerStats *service = new PowerStats(); PowerStats *service = new PowerStats();
// Add power entities related to rpmh if (isDebuggable) {
const uint64_t RPM_CLK = 19200; // RPM runs at 19.2Mhz. Divide by 19200 for msec // Add power entities related to rpmh
std::function<uint64_t(uint64_t)> rpmConvertToMs = [](uint64_t a) { return a / RPM_CLK; }; const uint64_t RPM_CLK = 19200; // RPM runs at 19.2Mhz. Divide by 19200 for msec
std::vector<StateResidencyConfig> rpmStateResidencyConfigs = { std::function<uint64_t(uint64_t)> rpmConvertToMs = [](uint64_t a) { return a / RPM_CLK; };
{.name = "XO_shutdown", std::vector<StateResidencyConfig> rpmStateResidencyConfigs = {
.entryCountSupported = true, {.name = "XO_shutdown",
.entryCountPrefix = "XO Count:", .entryCountSupported = true,
.totalTimeSupported = true, .entryCountPrefix = "XO Count:",
.totalTimePrefix = "Accumulated XO duration:", .totalTimeSupported = true,
.totalTimeTransform = rpmConvertToMs, .totalTimePrefix = "Accumulated XO duration:",
.lastEntrySupported = false}}; .totalTimeTransform = rpmConvertToMs,
.lastEntrySupported = false}};
sp<GenericStateResidencyDataProvider> rpmSdp = sp<GenericStateResidencyDataProvider> rpmSdp =
new GenericStateResidencyDataProvider("/d/system_stats"); new GenericStateResidencyDataProvider("/d/system_stats");
uint32_t apssId = service->addPowerEntity("APSS", PowerEntityType::SUBSYSTEM); uint32_t apssId = service->addPowerEntity("APSS", PowerEntityType::SUBSYSTEM);
rpmSdp->addEntity(apssId, PowerEntityConfig("APSS", rpmStateResidencyConfigs)); rpmSdp->addEntity(apssId, PowerEntityConfig("APSS", rpmStateResidencyConfigs));
uint32_t mpssId = service->addPowerEntity("MPSS", PowerEntityType::SUBSYSTEM); uint32_t mpssId = service->addPowerEntity("MPSS", PowerEntityType::SUBSYSTEM);
rpmSdp->addEntity(mpssId, PowerEntityConfig("MPSS", rpmStateResidencyConfigs)); rpmSdp->addEntity(mpssId, PowerEntityConfig("MPSS", rpmStateResidencyConfigs));
uint32_t adspId = service->addPowerEntity("ADSP", PowerEntityType::SUBSYSTEM); uint32_t adspId = service->addPowerEntity("ADSP", PowerEntityType::SUBSYSTEM);
rpmSdp->addEntity(adspId, PowerEntityConfig("ADSP", rpmStateResidencyConfigs)); rpmSdp->addEntity(adspId, PowerEntityConfig("ADSP", rpmStateResidencyConfigs));
uint32_t slpiId = service->addPowerEntity("SLPI", PowerEntityType::SUBSYSTEM); uint32_t slpiId = service->addPowerEntity("SLPI", PowerEntityType::SUBSYSTEM);
rpmSdp->addEntity(slpiId, PowerEntityConfig("SLPI", rpmStateResidencyConfigs)); rpmSdp->addEntity(slpiId, PowerEntityConfig("SLPI", rpmStateResidencyConfigs));
service->addStateResidencyDataProvider(rpmSdp); service->addStateResidencyDataProvider(rpmSdp);
// Add SoC power entity // Add SoC power entity
std::vector<StateResidencyConfig> socStateResidencyConfigs = { std::vector<StateResidencyConfig> socStateResidencyConfigs = {
{.name = "XO_shutdown", {.name = "XO_shutdown",
.header = "RPM Mode:vlow", .header = "RPM Mode:vlow",
.entryCountSupported = true, .entryCountSupported = true,
.entryCountPrefix = "count:", .entryCountPrefix = "count:",
.totalTimeSupported = true, .totalTimeSupported = true,
.totalTimePrefix = "actual last sleep(msec):", .totalTimePrefix = "actual last sleep(msec):",
.lastEntrySupported = false}, .lastEntrySupported = false},
{.name = "VMIN", {.name = "VMIN",
.header = "RPM Mode:vmin", .header = "RPM Mode:vmin",
.entryCountSupported = true, .entryCountSupported = true,
.entryCountPrefix = "count:", .entryCountPrefix = "count:",
.totalTimeSupported = true, .totalTimeSupported = true,
.totalTimePrefix = "actual last sleep(msec):", .totalTimePrefix = "actual last sleep(msec):",
.lastEntrySupported = false}}; .lastEntrySupported = false}};
sp<GenericStateResidencyDataProvider> socSdp = sp<GenericStateResidencyDataProvider> socSdp =
new GenericStateResidencyDataProvider("/d/system_stats"); new GenericStateResidencyDataProvider("/d/system_stats");
uint32_t socId = service->addPowerEntity("SoC", PowerEntityType::POWER_DOMAIN); uint32_t socId = service->addPowerEntity("SoC", PowerEntityType::POWER_DOMAIN);
socSdp->addEntity(socId, PowerEntityConfig(socStateResidencyConfigs)); socSdp->addEntity(socId, PowerEntityConfig(socStateResidencyConfigs));
service->addStateResidencyDataProvider(socSdp); service->addStateResidencyDataProvider(socSdp);
// Add WLAN power entity // Add WLAN power entity
uint32_t wlanId = service->addPowerEntity("WLAN", PowerEntityType::SUBSYSTEM); uint32_t wlanId = service->addPowerEntity("WLAN", PowerEntityType::SUBSYSTEM);
sp<WlanStateResidencyDataProvider> wlanSdp = sp<WlanStateResidencyDataProvider> wlanSdp =
new WlanStateResidencyDataProvider(wlanId, "/d/wlan0/power_stats"); new WlanStateResidencyDataProvider(wlanId, "/d/wlan0/power_stats");
service->addStateResidencyDataProvider(wlanSdp); service->addStateResidencyDataProvider(wlanSdp);
}
// Add Easel power entity // Add Easel power entity
uint32_t easelId = service->addPowerEntity("Easel", PowerEntityType::SUBSYSTEM); uint32_t easelId = service->addPowerEntity("Easel", PowerEntityType::SUBSYSTEM);