Add reporting of long wake locks.
These appear as a new event in the battery stats history, "longwake" in the long version and "Elw" in the checkin. The power manager keeps track of which wake locks are held for a long time and reports them to battery stats. Long is currently considered 1 minute or more. Once it is long, the start event will appear, and once if is released the event will end. In the case of a wake lock changing (typically its work source changing), for purposes of this accounting this is considering a pure release of the old state and start of the new state... so the timer will reset back to one minute until the wake lock is considered long. This is done to prevent things that make lots of changes to wake lock work sources from spamming the log. Bug: 28753137 Change-Id: I33b6168c57a7ea6ea558273dec731704123124a5
This commit is contained in:
@@ -1302,9 +1302,11 @@ public abstract class BatteryStats implements Parcelable {
|
||||
// Event for the UID that woke up the application processor.
|
||||
// Used for wakeups coming from WiFi, modem, etc.
|
||||
public static final int EVENT_WAKEUP_AP = 0x0013;
|
||||
// Event for reporting that a specific partial wake lock has been held for a long duration.
|
||||
public static final int EVENT_LONG_WAKE_LOCK = 0x0014;
|
||||
|
||||
// Number of event types.
|
||||
public static final int EVENT_COUNT = 0x0014;
|
||||
public static final int EVENT_COUNT = 0x0015;
|
||||
// Mask to extract out only the type part of the event.
|
||||
public static final int EVENT_TYPE_MASK = ~(EVENT_FLAG_START|EVENT_FLAG_FINISH);
|
||||
|
||||
@@ -1332,6 +1334,10 @@ public abstract class BatteryStats implements Parcelable {
|
||||
EVENT_TEMP_WHITELIST | EVENT_FLAG_START;
|
||||
public static final int EVENT_TEMP_WHITELIST_FINISH =
|
||||
EVENT_TEMP_WHITELIST | EVENT_FLAG_FINISH;
|
||||
public static final int EVENT_LONG_WAKE_LOCK_START =
|
||||
EVENT_LONG_WAKE_LOCK | EVENT_FLAG_START;
|
||||
public static final int EVENT_LONG_WAKE_LOCK_FINISH =
|
||||
EVENT_LONG_WAKE_LOCK | EVENT_FLAG_FINISH;
|
||||
|
||||
// For CMD_EVENT.
|
||||
public int eventCode;
|
||||
@@ -1996,13 +2002,13 @@ public abstract class BatteryStats implements Parcelable {
|
||||
public static final String[] HISTORY_EVENT_NAMES = new String[] {
|
||||
"null", "proc", "fg", "top", "sync", "wake_lock_in", "job", "user", "userfg", "conn",
|
||||
"active", "pkginst", "pkgunin", "alarm", "stats", "inactive", "active", "tmpwhitelist",
|
||||
"screenwake", "wakeupap"
|
||||
"screenwake", "wakeupap", "longwake"
|
||||
};
|
||||
|
||||
public static final String[] HISTORY_EVENT_CHECKIN_NAMES = new String[] {
|
||||
"Enl", "Epr", "Efg", "Etp", "Esy", "Ewl", "Ejb", "Eur", "Euf", "Ecn",
|
||||
"Eac", "Epi", "Epu", "Eal", "Est", "Eai", "Eaa", "Etw",
|
||||
"Esw", "Ewa"
|
||||
"Esw", "Ewa", "Elw"
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -79,6 +79,8 @@ interface IBatteryStats {
|
||||
String newHistoryName, int newType, boolean newUnimportantForLogging);
|
||||
void noteStopWakelockFromSource(in WorkSource ws, int pid, String name, String historyName,
|
||||
int type);
|
||||
void noteLongPartialWakelockStart(String name, String historyName, int uid);
|
||||
void noteLongPartialWakelockFinish(String name, String historyName, int uid);
|
||||
|
||||
void noteVibratorOn(int uid, long durationMillis);
|
||||
void noteVibratorOff(int uid);
|
||||
|
||||
@@ -3285,6 +3285,36 @@ public class BatteryStatsImpl extends BatteryStats {
|
||||
}
|
||||
}
|
||||
|
||||
public void noteLongPartialWakelockStart(String name, String historyName, int uid) {
|
||||
uid = mapUid(uid);
|
||||
final long elapsedRealtime = mClocks.elapsedRealtime();
|
||||
final long uptime = mClocks.uptimeMillis();
|
||||
if (historyName == null) {
|
||||
historyName = name;
|
||||
}
|
||||
if (!mActiveEvents.updateState(HistoryItem.EVENT_LONG_WAKE_LOCK_START, historyName, uid,
|
||||
0)) {
|
||||
return;
|
||||
}
|
||||
addHistoryEventLocked(elapsedRealtime, uptime, HistoryItem.EVENT_LONG_WAKE_LOCK_START,
|
||||
historyName, uid);
|
||||
}
|
||||
|
||||
public void noteLongPartialWakelockFinish(String name, String historyName, int uid) {
|
||||
uid = mapUid(uid);
|
||||
final long elapsedRealtime = mClocks.elapsedRealtime();
|
||||
final long uptime = mClocks.uptimeMillis();
|
||||
if (historyName == null) {
|
||||
historyName = name;
|
||||
}
|
||||
if (!mActiveEvents.updateState(HistoryItem.EVENT_LONG_WAKE_LOCK_FINISH, historyName, uid,
|
||||
0)) {
|
||||
return;
|
||||
}
|
||||
addHistoryEventLocked(elapsedRealtime, uptime, HistoryItem.EVENT_LONG_WAKE_LOCK_FINISH,
|
||||
historyName, uid);
|
||||
}
|
||||
|
||||
void aggregateLastWakeupUptimeLocked(long uptimeMs) {
|
||||
if (mLastWakeupReason != null) {
|
||||
long deltaUptime = uptimeMs - mLastWakeupUptimeMs;
|
||||
|
||||
Reference in New Issue
Block a user