Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3b581a1 authored by Kweku Adams's avatar Kweku Adams Committed by Automerger Merge Worker
Browse files

Merge "Properly adjust pending job count." into sc-dev am: a6b2dea8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c7ef17f35219ce5df9d9d6fb977234fab0ca1a1
parents 7c73083d a6b2dea8

apex/jobscheduler/service/java/com/android/server/job/JobConcurrencyManager.java

+64 −20
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ import java.util.List; 
 * and which {@link JobServiceContext} to run each job on.

 */

class JobConcurrencyManager {

    private static final String TAG = JobSchedulerService.TAG;

    private static final String TAG = JobSchedulerService.TAG + ".Concurrency";

    private static final boolean DEBUG = JobSchedulerService.DEBUG;



    static final String CONFIG_KEY_PREFIX_CONCURRENCY = "concurrency_";
@@ -321,13 +321,14 @@ class JobConcurrencyManager { 
        }

    }



    /** Return {@code true} if the state was updated. */

    @GuardedBy("mLock")

    private void refreshSystemStateLocked() {

    private boolean refreshSystemStateLocked() {

        final long nowUptime = JobSchedulerService.sUptimeMillisClock.millis();



        // Only refresh the information every so often.

        if (nowUptime < mNextSystemStateRefreshTime) {

            return;

            return false;

        }



        final long start = mStatLogger.getTime();
@@ -340,11 +341,14 @@ class JobConcurrencyManager { 
        }



        mStatLogger.logDurationStat(Stats.REFRESH_SYSTEM_STATE, start);

        return true;

    }



    @GuardedBy("mLock")

    private void updateCounterConfigLocked() {

        refreshSystemStateLocked();

        if (!refreshSystemStateLocked()) {

            return;

        }



        final WorkConfigLimitsPerMemoryTrimLevel workConfigs = mEffectiveInteractiveState

                ? CONFIG_LIMITS_SCREEN_ON : CONFIG_LIMITS_SCREEN_OFF;
@@ -437,7 +441,8 @@ class JobConcurrencyManager { 
            // (sharing the same Uid as nextPending)

            int minPriorityForPreemption = Integer.MAX_VALUE;

            int selectedContextId = -1;

            int workType = mWorkCountTracker.canJobStart(getJobWorkTypes(nextPending));

            int allWorkTypes = getJobWorkTypes(nextPending);

            int workType = mWorkCountTracker.canJobStart(allWorkTypes);

            boolean startingJob = false;

            for (int j = 0; j < MAX_JOB_CONTEXTS_COUNT; j++) {

                JobStatus job = contextIdToJobMap[j];
@@ -483,7 +488,7 @@ class JobConcurrencyManager { 
            if (startingJob) {

                // Increase the counters when we're going to start a job.

                workTypeForContext[selectedContextId] = workType;

                mWorkCountTracker.stageJob(workType);

                mWorkCountTracker.stageJob(workType, allWorkTypes);

            }

        }

        if (DEBUG) {
@@ -578,8 +583,10 @@ class JobConcurrencyManager { 


            JobStatus highestPriorityJob = null;

            int highPriWorkType = workType;

            int highPriAllWorkTypes = workType;

            JobStatus backupJob = null;

            int backupWorkType = WORK_TYPE_NONE;

            int backupAllWorkTypes = WORK_TYPE_NONE;

            for (int i = 0; i < pendingJobs.size(); i++) {

                final JobStatus nextPending = pendingJobs.get(i);
@@ -589,11 +596,12 @@ class JobConcurrencyManager { 


                if (worker.getPreferredUid() != nextPending.getUid()) {

                    if (backupJob == null) {

                        int workAsType =

                                mWorkCountTracker.canJobStart(getJobWorkTypes(nextPending));

                        int allWorkTypes = getJobWorkTypes(nextPending);

                        int workAsType = mWorkCountTracker.canJobStart(allWorkTypes);

                        if (workAsType != WORK_TYPE_NONE) {

                            backupJob = nextPending;

                            backupWorkType = workAsType;

                            backupAllWorkTypes = allWorkTypes;

                        }

                    }

                    continue;
@@ -611,7 +619,8 @@ class JobConcurrencyManager { 
                // reserved slots. We should just run the highest priority job we can find,

                // though it would be ideal to use an available WorkType slot instead of

                // overloading slots.

                final int workAsType = mWorkCountTracker.canJobStart(getJobWorkTypes(nextPending));

                highPriAllWorkTypes = getJobWorkTypes(nextPending);

                final int workAsType = mWorkCountTracker.canJobStart(highPriAllWorkTypes);

                if (workAsType == WORK_TYPE_NONE) {

                    // Just use the preempted job's work type since this new one is technically

                    // replacing it anyway.
@@ -624,7 +633,7 @@ class JobConcurrencyManager { 
                if (DEBUG) {

                    Slog.d(TAG, "Running job " + jobStatus + " as preemption");

                }

                mWorkCountTracker.stageJob(highPriWorkType);

                mWorkCountTracker.stageJob(highPriWorkType, highPriAllWorkTypes);

                startJobLocked(worker, highestPriorityJob, highPriWorkType);

            } else {

                if (DEBUG) {
@@ -635,7 +644,7 @@ class JobConcurrencyManager { 
                    if (DEBUG) {

                        Slog.d(TAG, "Running job " + jobStatus + " instead");

                    }

                    mWorkCountTracker.stageJob(backupWorkType);

                    mWorkCountTracker.stageJob(backupWorkType, backupAllWorkTypes);

                    startJobLocked(worker, backupJob, backupWorkType);

                }

            }
@@ -647,6 +656,7 @@ class JobConcurrencyManager { 
            // find.

            JobStatus highestPriorityJob = null;

            int highPriWorkType = workType;

            int highPriAllWorkTypes = workType;

            for (int i = 0; i < pendingJobs.size(); i++) {

                final JobStatus nextPending = pendingJobs.get(i);
@@ -654,7 +664,8 @@ class JobConcurrencyManager { 
                    continue;

                }



                final int workAsType = mWorkCountTracker.canJobStart(getJobWorkTypes(nextPending));

                final int allWorkTypes = getJobWorkTypes(nextPending);

                final int workAsType = mWorkCountTracker.canJobStart(allWorkTypes);

                if (workAsType == WORK_TYPE_NONE) {

                    continue;

                }
@@ -663,6 +674,7 @@ class JobConcurrencyManager { 
                        < nextPending.lastEvaluatedPriority) {

                    highestPriorityJob = nextPending;

                    highPriWorkType = workAsType;

                    highPriAllWorkTypes = allWorkTypes;

                }

            }
@@ -672,7 +684,7 @@ class JobConcurrencyManager { 
                if (DEBUG) {

                    Slog.d(TAG, "About to run job: " + jobStatus);

                }

                mWorkCountTracker.stageJob(highPriWorkType);

                mWorkCountTracker.stageJob(highPriWorkType, highPriAllWorkTypes);

                startJobLocked(worker, highestPriorityJob, highPriWorkType);

            }

        }
@@ -1102,26 +1114,58 @@ class JobConcurrencyManager { 
        }



        void incrementPendingJobCount(int workTypes) {

            adjustPendingJobCount(workTypes, true);

        }



        void decrementPendingJobCount(int workTypes) {

            if (adjustPendingJobCount(workTypes, false) > 1) {

                // We don't need to adjust reservations if only one work type was modified

                // because that work type is the one we're using.



                // 0 is WORK_TYPE_NONE.

                int workType = 1;

                int rem = workTypes;

                while (rem > 0) {

                    if ((rem & 1) != 0) {

                        maybeAdjustReservations(workType);

                    }

                    rem = rem >>> 1;

                    workType = workType << 1;

                }

            }

        }



        /** Returns the number of WorkTypes that were modified. */

        private int adjustPendingJobCount(int workTypes, boolean add) {

            final int adj = add ? 1 : -1;



            int numAdj = 0;

            // We don't know which type we'll classify the job as when we run it yet, so make sure

            // we have space in all applicable slots.

            if ((workTypes & WORK_TYPE_TOP) == WORK_TYPE_TOP) {

                mNumPendingJobs.put(WORK_TYPE_TOP, mNumPendingJobs.get(WORK_TYPE_TOP) + 1);

                mNumPendingJobs.put(WORK_TYPE_TOP, mNumPendingJobs.get(WORK_TYPE_TOP) + adj);

                numAdj++;

            }

            if ((workTypes & WORK_TYPE_EJ) == WORK_TYPE_EJ) {

                mNumPendingJobs.put(WORK_TYPE_EJ, mNumPendingJobs.get(WORK_TYPE_EJ) + 1);

                mNumPendingJobs.put(WORK_TYPE_EJ, mNumPendingJobs.get(WORK_TYPE_EJ) + adj);

                numAdj++;

            }

            if ((workTypes & WORK_TYPE_BG) == WORK_TYPE_BG) {

                mNumPendingJobs.put(WORK_TYPE_BG, mNumPendingJobs.get(WORK_TYPE_BG) + 1);

                mNumPendingJobs.put(WORK_TYPE_BG, mNumPendingJobs.get(WORK_TYPE_BG) + adj);

                numAdj++;

            }

            if ((workTypes & WORK_TYPE_BGUSER) == WORK_TYPE_BGUSER) {

                mNumPendingJobs.put(WORK_TYPE_BGUSER, mNumPendingJobs.get(WORK_TYPE_BGUSER) + 1);

                mNumPendingJobs.put(WORK_TYPE_BGUSER, mNumPendingJobs.get(WORK_TYPE_BGUSER) + adj);

                numAdj++;

            }



            return numAdj;

        }



        void stageJob(@WorkType int workType) {

        void stageJob(@WorkType int workType, int allWorkTypes) {

            final int newNumStartingJobs = mNumStartingJobs.get(workType) + 1;

            mNumStartingJobs.put(workType, newNumStartingJobs);

            mNumPendingJobs.put(workType, Math.max(0, mNumPendingJobs.get(workType) - 1));

            decrementPendingJobCount(allWorkTypes);

            if (newNumStartingJobs + mNumRunningJobs.get(workType)

                    > mNumActuallyReservedSlots.get(workType)) {

                mNumUnspecializedRemaining--;

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+2 −2
Original line number Diff line number Diff line
@@ -3183,7 +3183,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    TimeUtils.formatDuration(jsc.getTimeoutElapsed() - nowElapsed, pw);

                    pw.println();

                    job.dump(pw, "    ", false, nowElapsed);

                    int priority = evaluateJobPriorityLocked(jsc.getRunningJobLocked());

                    int priority = evaluateJobPriorityLocked(job);

                    pw.print("    Evaluated priority: ");

                    pw.println(JobInfo.getPriorityString(priority));
@@ -3349,7 +3349,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    job.dump(proto, ActiveJob.RunningJob.DUMP, false, nowElapsed);



                    proto.write(ActiveJob.RunningJob.EVALUATED_PRIORITY,

                            evaluateJobPriorityLocked(jsc.getRunningJobLocked()));

                            evaluateJobPriorityLocked(job));



                    proto.write(ActiveJob.RunningJob.TIME_SINCE_MADE_ACTIVE_MS,

                            nowUptime - job.madeActive);

apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.server.job.JobConcurrencyManager.WORK_TYPE_NONE; 
import static com.android.server.job.JobSchedulerService.RESTRICTED_INDEX;

import static com.android.server.job.JobSchedulerService.sElapsedRealtimeClock;



import android.annotation.Nullable;

import android.app.job.IJobCallback;

import android.app.job.IJobService;

import android.app.job.JobInfo;
@@ -326,6 +327,7 @@ public final class JobServiceContext implements ServiceConnection { 
    /**

     * Used externally to query the running job. Will return null if there is no job running.

     */

    @Nullable

    JobStatus getRunningJobLocked() {

        return mRunningJob;

    }

services/tests/servicestests/src/com/android/server/job/WorkCountTrackerTest.java

+320 −73

File changed.

Preview size limit exceeded, changes collapsed.