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

Merge "Stop reporting the duration including sleep for background DexOpt" am: cda25145c7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2281490

Change-Id: Ieed94bb6ff25195c634ba680f2ead58b4e1f690a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Stefano Cianciulli
2022-11-10 18:41:24 +00:00
committed by Automerger Merge Worker
parent ae4b67dc4e cda25145c7
commit b048d1bbbb
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/pm/BackgroundDexOptService.java
View File

@@ -149,8 +149,6 @@ public final class BackgroundDexOptService {
@GuardedBy("mLock") @Status private int mLastExecutionStatus = STATUS_OK;
@GuardedBy("mLock") private long mLastExecutionStartTimeMs;
@GuardedBy("mLock") private long mLastExecutionDurationIncludingSleepMs;
@GuardedBy("mLock") private long mLastExecutionStartUptimeMs;
@GuardedBy("mLock") private long mLastExecutionDurationMs;
@@ -229,10 +227,6 @@ public final class BackgroundDexOptService {
writer.println(mFinishedPostBootUpdate);
writer.print("mLastExecutionStatus:");
writer.println(mLastExecutionStatus);
writer.print("mLastExecutionStartTimeMs:");
writer.println(mLastExecutionStartTimeMs);
writer.print("mLastExecutionDurationIncludingSleepMs:");
writer.println(mLastExecutionDurationIncludingSleepMs);
writer.print("mLastExecutionStartUptimeMs:");
writer.println(mLastExecutionStartUptimeMs);
writer.print("mLastExecutionDurationMs:");
@@ -539,8 +533,6 @@ public final class BackgroundDexOptService {
private boolean runIdleOptimization(
PackageManagerService pm, List<String> pkgs, boolean isPostBootUpdate) {
synchronized (mLock) {
mLastExecutionStartTimeMs = SystemClock.elapsedRealtime();
mLastExecutionDurationIncludingSleepMs = -1;
mLastExecutionStartUptimeMs = SystemClock.uptimeMillis();
mLastExecutionDurationMs = -1;
}
@@ -549,8 +541,6 @@ public final class BackgroundDexOptService {
logStatus(status);
synchronized (mLock) {
mLastExecutionStatus = status;
mLastExecutionDurationIncludingSleepMs =
SystemClock.elapsedRealtime() - mLastExecutionStartTimeMs;
mLastExecutionDurationMs = SystemClock.uptimeMillis() - mLastExecutionStartUptimeMs;
}
@@ -954,10 +944,9 @@ public final class BackgroundDexOptService {
synchronized (mLock) {
status = mLastExecutionStatus;
durationMs = mLastExecutionDurationMs;
durationIncludingSleepMs = mLastExecutionDurationIncludingSleepMs;
}
mStatsLogger.write(status, params.getStopReason(), durationMs, durationIncludingSleepMs);
mStatsLogger.write(status, params.getStopReason(), durationMs);
}
/** Injector pattern for testing purpose */

11
services/core/java/com/android/server/pm/dex/ArtStatsLogUtils.java
View File

@@ -320,12 +320,15 @@ public class ArtStatsLogUtils {
public static class BackgroundDexoptJobStatsLogger {
/** Writes background dexopt job stats to statsd. */
public void write(@BackgroundDexOptService.Status int status,
@JobParameters.StopReason int cancellationReason, long durationMs,
long durationIncludingSleepMs) {
ArtStatsLog.write(ArtStatsLog.BACKGROUND_DEXOPT_JOB_ENDED,
@JobParameters.StopReason int cancellationReason,
long durationMs) {
ArtStatsLog.write(
ArtStatsLog.BACKGROUND_DEXOPT_JOB_ENDED,
STATUS_MAP.getOrDefault(status,
ArtStatsLog.BACKGROUND_DEXOPT_JOB_ENDED__STATUS__STATUS_UNKNOWN),
cancellationReason, durationMs, durationIncludingSleepMs);
cancellationReason,
durationMs,
0); // deprecated, used to be durationIncludingSleepMs
}
}
}