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

Merge "Trace job execution." into tm-qpr-dev am: 24fdd1fc95

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

Change-Id: I0572e5d3e0141f2ebaa0299ef42755c3af5c0ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Simon MacMullen
2022-09-20 17:45:37 +00:00
committed by Automerger Merge Worker
parent 0ac4d2e85d 24fdd1fc95
commit 307f07e4b4
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java
View File

@@ -43,6 +43,7 @@ import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.Trace;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.EventLog; import android.util.EventLog;
import android.util.IndentingPrintWriter; import android.util.IndentingPrintWriter;
@@ -361,6 +362,9 @@ public final class JobServiceContext implements ServiceConnection {
job.getJob().getPriority(), job.getJob().getPriority(),
job.getEffectivePriority(), job.getEffectivePriority(),
job.getNumFailures()); job.getNumFailures());
// Use the context's ID to distinguish traces since there'll only be one job running
// per context.
Trace.asyncTraceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, job.getTag(), getId());
try { try {
mBatteryStats.noteJobStart(job.getBatteryName(), job.getSourceUid()); mBatteryStats.noteJobStart(job.getBatteryName(), job.getSourceUid());
} catch (RemoteException e) { } catch (RemoteException e) {
@@ -1024,6 +1028,7 @@ public final class JobServiceContext implements ServiceConnection {
completedJob.getJob().getPriority(), completedJob.getJob().getPriority(),
completedJob.getEffectivePriority(), completedJob.getEffectivePriority(),
completedJob.getNumFailures()); completedJob.getNumFailures());
Trace.asyncTraceEnd(Trace.TRACE_TAG_SYSTEM_SERVER, completedJob.getTag(), getId());
try { try {
mBatteryStats.noteJobFinish(mRunningJob.getBatteryName(), mRunningJob.getSourceUid(), mBatteryStats.noteJobFinish(mRunningJob.getBatteryName(), mRunningJob.getSourceUid(),
internalStopReason); internalStopReason);

2
apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java
View File

@@ -496,7 +496,7 @@ public final class JobStatus {
this.batteryName = this.sourceTag != null this.batteryName = this.sourceTag != null
? this.sourceTag + ":" + job.getService().getPackageName() ? this.sourceTag + ":" + job.getService().getPackageName()
: job.getService().flattenToShortString(); : job.getService().flattenToShortString();
this.tag = "*job*/" + this.batteryName; this.tag = "*job*/" + this.batteryName + "#" + job.getId();
this.earliestRunTimeElapsedMillis = earliestRunTimeElapsedMillis; this.earliestRunTimeElapsedMillis = earliestRunTimeElapsedMillis;
this.latestRunTimeElapsedMillis = latestRunTimeElapsedMillis; this.latestRunTimeElapsedMillis = latestRunTimeElapsedMillis;