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

Merge "Fix concurrency logging." into udc-dev am: 13c49d38e0

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

Change-Id: I6f108ccc401a17d7513e95862e85b3af607357e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-05-11 17:00:36 +00:00
committed by Automerger Merge Worker
parent 406b4437eb 13c49d38e0
commit 6309317b68
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java
View File

@@ -810,7 +810,7 @@ class JobConcurrencyManager {
mRecycledChanged, mRecycledIdle, mRecycledPreferredUidOnly, mRecycledStoppable,
mRecycledAssignmentInfo, mRecycledPrivilegedState);
noteConcurrency();
noteConcurrency(true);
}
@VisibleForTesting
@@ -1437,11 +1437,13 @@ class JobConcurrencyManager {
}
}
private void noteConcurrency() {
private void noteConcurrency(boolean logForHistogram) {
mService.mJobPackageTracker.noteConcurrency(mRunningJobs.size(),
// TODO: log per type instead of only TOP
mWorkCountTracker.getRunningJobCount(WORK_TYPE_TOP));
sConcurrencyHistogramLogger.logSample(mActiveServices.size());
if (logForHistogram) {
sConcurrencyHistogramLogger.logSample(mActiveServices.size());
}
}
@GuardedBy("mLock")
@@ -1582,7 +1584,9 @@ class JobConcurrencyManager {
final PendingJobQueue pendingJobQueue = mService.getPendingJobQueue();
if (pendingJobQueue.size() == 0) {
worker.clearPreferredUid();
noteConcurrency();
// Don't log the drop in concurrency to the histogram, otherwise, we'll end up
// overcounting lower concurrency values as jobs end execution.
noteConcurrency(false);
return;
}
if (mActiveServices.size() >= mSteadyStateConcurrencyLimit) {
@@ -1612,7 +1616,9 @@ class JobConcurrencyManager {
// scheduled), but we should
// be able to stop the other jobs soon so don't start running anything new until we
// get back below the limit.
noteConcurrency();
// Don't log the drop in concurrency to the histogram, otherwise, we'll end up
// overcounting lower concurrency values as jobs end execution.
noteConcurrency(false);
return;
}
}
@@ -1761,7 +1767,9 @@ class JobConcurrencyManager {
}
}
noteConcurrency();
// Don't log the drop in concurrency to the histogram, otherwise, we'll end up
// overcounting lower concurrency values as jobs end execution.
noteConcurrency(false);
}
/**