Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerstats: Use PowerStatsInternal API in statsd puller

Browse Source 
Bug: 168832285
Test: cmd stats pull-source 10038
Test: cmd stats pull-source 10005
Change-Id: I69f9cc55680b2cbde7423c022c101852fdecb42b
This commit is contained in:
Benjamin Schwartz
2021-02-05 18:04:59 -08:00
parent e0a1abd54b
commit d7f4f391db
2 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/powerstats/PowerStatsService.java
View File

@@ -73,6 +73,8 @@ public class PowerStatsService extends SystemService {
private TimerTrigger mTimerTrigger;
@Nullable
private StatsPullAtomCallbackImpl mPullAtomCallback;
@Nullable
private PowerStatsInternal mPowerStatsInternal;
@VisibleForTesting
static class Injector {
@@ -125,8 +127,8 @@ public class PowerStatsService extends SystemService {
}
StatsPullAtomCallbackImpl createStatsPullerImpl(Context context,
IPowerStatsHALWrapper powerStatsHALWrapper) {
return new StatsPullAtomCallbackImpl(context, powerStatsHALWrapper);
PowerStatsInternal powerStatsInternal) {
return new StatsPullAtomCallbackImpl(context, powerStatsInternal);
}
}
@@ -175,21 +177,14 @@ public class PowerStatsService extends SystemService {
@Override
public void onStart() {
if (getPowerStatsHal().isInitialized()) {
// Only create internal service if PowerStatsHal is available.
publishLocalService(PowerStatsInternal.class, new LocalService());
mPowerStatsInternal = new LocalService();
publishLocalService(PowerStatsInternal.class, mPowerStatsInternal);
}
publishBinderService(Context.POWER_STATS_SERVICE, new BinderService());
}
private void onSystemServicesReady() {
if (getPowerStatsHal().isInitialized()) {
if (DEBUG) Slog.d(TAG, "Starting PowerStatsService statsd pullers");
// Only start statsd pullers if initialization is successful.
mPullAtomCallback = mInjector.createStatsPullerImpl(mContext, getPowerStatsHal());
} else {
Slog.e(TAG, "Failed to start PowerStatsService statsd pullers");
}
mPullAtomCallback = mInjector.createStatsPullerImpl(mContext, mPowerStatsInternal);
}
private void onBootCompleted() {

89
services/core/java/com/android/server/powerstats/StatsPullAtomCallbackImpl.java
View File

@@ -24,26 +24,31 @@ import android.hardware.power.stats.PowerEntity;
import android.hardware.power.stats.State;
import android.hardware.power.stats.StateResidency;
import android.hardware.power.stats.StateResidencyResult;
import android.power.PowerStatsInternal;
import android.util.Slog;
import android.util.StatsEvent;
import com.android.internal.util.ConcurrentUtils;
import com.android.internal.util.FrameworkStatsLog;
import com.android.server.powerstats.PowerStatsHALWrapper.IPowerStatsHALWrapper;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
* StatsPullAtomCallbackImpl is responsible implementing the stats pullers for
* SUBSYSTEM_SLEEP_STATE and ON_DEVICE_POWER_MEASUREMENT statsd atoms.
*/
public class StatsPullAtomCallbackImpl implements StatsManager.StatsPullAtomCallback {
private static final String TAG = StatsPullAtomCallbackImpl.class.getSimpleName();
private Context mContext;
private IPowerStatsHALWrapper mPowerStatsHALWrapper;
private PowerStatsInternal mPowerStatsInternal;
private Map<Integer, Channel> mChannels = new HashMap();
private Map<Integer, String> mEntityNames = new HashMap();
private Map<Integer, Map<Integer, String>> mStateNames = new HashMap();;
private Map<Integer, Map<Integer, String>> mStateNames = new HashMap();
private static final int STATS_PULL_TIMEOUT_MILLIS = 2000;
private static final boolean DEBUG = false;
@Override
public int onPullAtom(int atomTag, List<StatsEvent> data) {
@@ -57,21 +62,28 @@ public class StatsPullAtomCallbackImpl implements StatsManager.StatsPullAtomCall
}
}
private void initPullOnDevicePowerMeasurement() {
Channel[] channels = mPowerStatsHALWrapper.getEnergyMeterInfo();
if (channels == null) {
return;
private boolean initPullOnDevicePowerMeasurement() {
Channel[] channels = mPowerStatsInternal.getEnergyMeterInfo();
if (channels == null || channels.length == 0) {
Slog.e(TAG, "Failed to init OnDevicePowerMeasurement puller");
return false;
}
for (int i = 0; i < channels.length; i++) {
final Channel channel = channels[i];
mChannels.put(channel.id, channel);
}
return true;
}
private int pullOnDevicePowerMeasurement(int atomTag, List<StatsEvent> events) {
EnergyMeasurement[] energyMeasurements = mPowerStatsHALWrapper.readEnergyMeter(new int[0]);
if (energyMeasurements == null) {
final EnergyMeasurement[] energyMeasurements;
try {
energyMeasurements = mPowerStatsInternal.readEnergyMeterAsync(new int[0])
.get(STATS_PULL_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
} catch (Exception e) {
Slog.e(TAG, "Failed to readEnergyMeterAsync", e);
return StatsManager.PULL_SKIP;
}
@@ -91,10 +103,11 @@ public class StatsPullAtomCallbackImpl implements StatsManager.StatsPullAtomCall
return StatsManager.PULL_SUCCESS;
}
private void initSubsystemSleepState() {
PowerEntity[] entities = mPowerStatsHALWrapper.getPowerEntityInfo();
if (entities == null) {
return;
private boolean initSubsystemSleepState() {
PowerEntity[] entities = mPowerStatsInternal.getPowerEntityInfo();
if (entities == null || entities.length == 0) {
Slog.e(TAG, "Failed to init SubsystemSleepState puller");
return false;
}
for (int i = 0; i < entities.length; i++) {
@@ -108,13 +121,20 @@ public class StatsPullAtomCallbackImpl implements StatsManager.StatsPullAtomCall
mEntityNames.put(entity.id, entity.name);
mStateNames.put(entity.id, states);
}
return true;
}
private int pullSubsystemSleepState(int atomTag, List<StatsEvent> events) {
StateResidencyResult[] results = mPowerStatsHALWrapper.getStateResidency(new int[0]);
if (results == null) {
final StateResidencyResult[] results;
try {
results = mPowerStatsInternal.getStateResidencyAsync(new int[0])
.get(STATS_PULL_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
} catch (Exception e) {
Slog.e(TAG, "Failed to getStateResidencyAsync", e);
return StatsManager.PULL_SKIP;
}
for (int i = 0; i < results.length; i++) {
final StateResidencyResult result = results[i];
for (int j = 0; j < result.stateResidencyData.length; j++) {
@@ -131,22 +151,33 @@ public class StatsPullAtomCallbackImpl implements StatsManager.StatsPullAtomCall
return StatsManager.PULL_SUCCESS;
}
public StatsPullAtomCallbackImpl(Context context, IPowerStatsHALWrapper powerStatsHALWrapper) {
public StatsPullAtomCallbackImpl(Context context, PowerStatsInternal powerStatsInternal) {
if (DEBUG) Slog.d(TAG, "Starting PowerStatsService statsd pullers");
mContext = context;
mPowerStatsHALWrapper = powerStatsHALWrapper;
initPullOnDevicePowerMeasurement();
initSubsystemSleepState();
mPowerStatsInternal = powerStatsInternal;
if (powerStatsInternal == null) {
Slog.e(TAG, "Failed to start PowerStatsService statsd pullers");
return;
}
StatsManager manager = mContext.getSystemService(StatsManager.class);
manager.setPullAtomCallback(
FrameworkStatsLog.SUBSYSTEM_SLEEP_STATE,
null, // use default PullAtomMetadata values
ConcurrentUtils.DIRECT_EXECUTOR,
this);
manager.setPullAtomCallback(
FrameworkStatsLog.ON_DEVICE_POWER_MEASUREMENT,
null, // use default PullAtomMetadata values
ConcurrentUtils.DIRECT_EXECUTOR,
this);
if (initPullOnDevicePowerMeasurement()) {
manager.setPullAtomCallback(
FrameworkStatsLog.ON_DEVICE_POWER_MEASUREMENT,
null, // use default PullAtomMetadata values
ConcurrentUtils.DIRECT_EXECUTOR,
this);
}
if (initSubsystemSleepState()) {
manager.setPullAtomCallback(
FrameworkStatsLog.SUBSYSTEM_SLEEP_STATE,
null, // use default PullAtomMetadata values
ConcurrentUtils.DIRECT_EXECUTOR,
this);
}
}
}