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

Merge "Improve short service debug log" into udc-dev

Browse Source
This commit is contained in:
Makoto Onuki
2023-03-10 20:44:29 +00:00
committed by Android (Google) Code Review
parent df0ef4dc12 ef9a11ebb7
commit 73ec965c30
2 changed files with 58 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -2067,7 +2067,9 @@ public final class ActiveServices {
final boolean isOldTypeShortFgs = r.isShortFgs();
final boolean isNewTypeShortFgs =
foregroundServiceType == FOREGROUND_SERVICE_TYPE_SHORT_SERVICE;
final boolean isOldTypeShortFgsAndTimedOut = r.shouldTriggerShortFgsTimeout();
final long nowUptime = SystemClock.uptimeMillis();
final boolean isOldTypeShortFgsAndTimedOut =
r.shouldTriggerShortFgsTimeout(nowUptime);
// If true, we skip the BFSL check.
boolean bypassBfslCheck = false;
@@ -3225,9 +3227,11 @@ public final class ActiveServices {
void onShortFgsTimeout(ServiceRecord sr) {
synchronized (mAm) {
if (!sr.shouldTriggerShortFgsTimeout()) {
final long nowUptime = SystemClock.uptimeMillis();
if (!sr.shouldTriggerShortFgsTimeout(nowUptime)) {
if (DEBUG_SHORT_SERVICE) {
Slog.d(TAG_SERVICE, "[STALE] Short FGS timed out: " + sr);
Slog.d(TAG_SERVICE, "[STALE] Short FGS timed out: " + sr
+ " " + sr.getShortFgsTimedEventDescription(nowUptime));
}
return;
}
@@ -3261,7 +3265,8 @@ public final class ActiveServices {
if (sr == null) {
return false;
}
return sr.shouldTriggerShortFgsTimeout();
final long nowUptime = SystemClock.uptimeMillis();
return sr.shouldTriggerShortFgsTimeout(nowUptime);
} finally {
Binder.restoreCallingIdentity(ident);
}
@@ -3269,9 +3274,11 @@ public final class ActiveServices {
void onShortFgsProcstateTimeout(ServiceRecord sr) {
synchronized (mAm) {
if (!sr.shouldDemoteShortFgsProcState()) {
final long nowUptime = SystemClock.uptimeMillis();
if (!sr.shouldDemoteShortFgsProcState(nowUptime)) {
if (DEBUG_SHORT_SERVICE) {
Slog.d(TAG_SERVICE, "[STALE] Short FGS procstate demotion: " + sr);
Slog.d(TAG_SERVICE, "[STALE] Short FGS procstate demotion: " + sr
+ " " + sr.getShortFgsTimedEventDescription(nowUptime));
}
return;
}
@@ -3292,9 +3299,11 @@ public final class ActiveServices {
synchronized (mAm) {
tr.mLatencyTracker.waitingOnAMSLockEnded();
if (!sr.shouldTriggerShortFgsAnr()) {
final long nowUptime = SystemClock.uptimeMillis();
if (!sr.shouldTriggerShortFgsAnr(nowUptime)) {
if (DEBUG_SHORT_SERVICE) {
Slog.d(TAG_SERVICE, "[STALE] Short FGS ANR'ed: " + sr);
Slog.d(TAG_SERVICE, "[STALE] Short FGS ANR'ed: " + sr
+ " " + sr.getShortFgsTimedEventDescription(nowUptime));
}
return;
}

64
services/core/java/com/android/server/am/ServiceRecord.java
View File

@@ -392,6 +392,15 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN
return mStartTime + ams.mConstants.mShortFgsTimeoutDuration
+ ams.mConstants.mShortFgsAnrExtraWaitDuration;
}
String getDescription() {
return "sfc=" + this.mStartForegroundCount
+ " sid=" + this.mStartId
+ " stime=" + this.mStartTime
+ " tt=" + this.getTimeoutTime()
+ " dt=" + this.getProcStateDemoteTime()
+ " at=" + this.getAnrTime();
}
}
/**
@@ -1413,10 +1422,7 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN
this.mShortFgsInfo = null;
}
/**
* @return true if it's a short FGS that's still up and running, and should be timed out.
*/
public boolean shouldTriggerShortFgsTimeout() {
private boolean shouldTriggerShortFgsTimedEvent(long targetTime, long nowUptime) {
if (!isAppAlive()) {
return false;
}
@@ -1424,36 +1430,48 @@ final class ServiceRecord extends Binder implements ComponentName.WithComponentN
|| !mShortFgsInfo.isCurrent()) {
return false;
}
return mShortFgsInfo.getTimeoutTime() <= SystemClock.uptimeMillis();
return targetTime <= nowUptime;
}
/**
* @return true if it's a short FGS that's still up and running, and should be timed out.
*/
public boolean shouldTriggerShortFgsTimeout(long nowUptime) {
return shouldTriggerShortFgsTimedEvent(
(mShortFgsInfo == null ? 0 : mShortFgsInfo.getTimeoutTime()),
nowUptime);
}
/**
* @return true if it's a short FGS's procstate should be demoted.
*/
public boolean shouldDemoteShortFgsProcState() {
if (!isAppAlive()) {
return false;
}
if (!this.startRequested || !isShortFgs() || mShortFgsInfo == null
|| !mShortFgsInfo.isCurrent()) {
return false;
}
return mShortFgsInfo.getProcStateDemoteTime() <= SystemClock.uptimeMillis();
public boolean shouldDemoteShortFgsProcState(long nowUptime) {
return shouldTriggerShortFgsTimedEvent(
(mShortFgsInfo == null ? 0 : mShortFgsInfo.getProcStateDemoteTime()),
nowUptime);
}
/**
* @return true if it's a short FGS that's still up and running, and should be declared
* an ANR.
*/
public boolean shouldTriggerShortFgsAnr() {
if (!isAppAlive()) {
return false;
}
if (!this.startRequested || !isShortFgs() || mShortFgsInfo == null
|| !mShortFgsInfo.isCurrent()) {
return false;
}
return mShortFgsInfo.getAnrTime() <= SystemClock.uptimeMillis();
public boolean shouldTriggerShortFgsAnr(long nowUptime) {
return shouldTriggerShortFgsTimedEvent(
(mShortFgsInfo == null ? 0 : mShortFgsInfo.getAnrTime()),
nowUptime);
}
/**
* Human readable description about short-FGS internal states.
*/
public String getShortFgsTimedEventDescription(long nowUptime) {
return "aa=" + isAppAlive()
+ " sreq=" + this.startRequested
+ " isfg=" + this.isForeground
+ " type=" + Integer.toHexString(this.foregroundServiceType)
+ " sfc=" + this.mStartForegroundCount
+ " now=" + nowUptime
+ " " + (mShortFgsInfo == null ? "" : mShortFgsInfo.getDescription());
}
private boolean isAppAlive() {