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

Commit 129bc371 authored by Edgar Arriaga's avatar Edgar Arriaga
Browse files

Change OOM Adj Reason to IntDef based enum 

This is because the OOM Adjust reason has to be
sent in new compaction stats and it saves data
usage by migrating to enum.

Bug: 233415647
Test: dumpsys activity
Change-Id: Icb4806d21f6aacdc82817d74462c648377397e2f
parent c0ac2779

services/core/java/com/android/server/am/ActiveServices.java

+8 −7
Original line number Diff line number Diff line
@@ -3595,11 +3595,12 @@ public final class ActiveServices { 


    /**

     * Bump the given service record into executing state.

     * @param oomAdjReason The caller requests it to perform the oomAdjUpdate if it's not null.

     * @param oomAdjReason The caller requests it to perform the oomAdjUpdate not {@link

     *         OomAdjuster#OOM_ADJ_REASON_NONE}.

     * @return {@code true} if it performed oomAdjUpdate.

     */

    private boolean bumpServiceExecutingLocked(ServiceRecord r, boolean fg, String why,

            @Nullable String oomAdjReason) {

    private boolean bumpServiceExecutingLocked(

            ServiceRecord r, boolean fg, String why, @OomAdjuster.OomAdjReason int oomAdjReason) {

        if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, ">>> EXECUTING "

                + why + " of " + r + " in app " + r.app);

        else if (DEBUG_SERVICE_EXECUTING) Slog.v(TAG_SERVICE_EXECUTING, ">>> EXECUTING "
@@ -3651,7 +3652,7 @@ public final class ActiveServices { 
            }

        }

        boolean oomAdjusted = false;

        if (oomAdjReason != null && r.app != null

        if (oomAdjReason != OomAdjuster.OOM_ADJ_REASON_NONE && r.app != null

                && r.app.mState.getCurProcState() > ActivityManager.PROCESS_STATE_SERVICE) {

            // Force an immediate oomAdjUpdate, so the client app could be in the correct process

            // state before doing any service related transactions
@@ -4385,7 +4386,7 @@ public final class ActiveServices { 


        final ProcessServiceRecord psr = app.mServices;

        final boolean newService = psr.startService(r);

        bumpServiceExecutingLocked(r, execInFg, "create", null /* oomAdjReason */);

        bumpServiceExecutingLocked(r, execInFg, "create", OomAdjuster.OOM_ADJ_REASON_NONE);

        mAm.updateLruProcessLocked(app, false, null);

        updateServiceForegroundLocked(psr, /* oomAdj= */ false);

        // Force an immediate oomAdjUpdate, so the client app could be in the correct process state
@@ -4511,7 +4512,7 @@ public final class ActiveServices { 
            mAm.grantImplicitAccess(r.userId, si.intent, si.callingId,

                    UserHandle.getAppId(r.appInfo.uid)

            );

            bumpServiceExecutingLocked(r, execInFg, "start", null /* oomAdjReason */);

            bumpServiceExecutingLocked(r, execInFg, "start", OomAdjuster.OOM_ADJ_REASON_NONE);

            if (r.fgRequired && !r.fgWaiting) {

                if (!r.isForeground) {

                    if (DEBUG_BACKGROUND_CHECK) {
@@ -4780,7 +4781,7 @@ public final class ActiveServices { 
                updateServiceForegroundLocked(r.app.mServices, false);

                try {

                    oomAdjusted |= bumpServiceExecutingLocked(r, false, "destroy",

                            oomAdjusted ? null : OomAdjuster.OOM_ADJ_REASON_UNBIND_SERVICE);

                            oomAdjusted ? 0 : OomAdjuster.OOM_ADJ_REASON_UNBIND_SERVICE);

                    mDestroyingServices.add(r);

                    r.destroying = true;

                    r.app.getThread().scheduleStopService(r);

services/core/java/com/android/server/am/ActivityManagerService.java

+8 −5
Original line number Diff line number Diff line
@@ -15598,7 +15598,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
     * {@link #enqueueOomAdjTargetLocked}.

     */

    @GuardedBy("this")

    void updateOomAdjPendingTargetsLocked(String oomAdjReason) {

    void updateOomAdjPendingTargetsLocked(@OomAdjuster.OomAdjReason int oomAdjReason) {

        mOomAdjuster.updateOomAdjPendingTargetsLocked(oomAdjReason);

    }









@@ -15617,7 +15617,7 @@ public class ActivityManagerService extends IActivityManager.Stub













    }





























    @GuardedBy("this")













    final void updateOomAdjLocked(String oomAdjReason) {













    final void updateOomAdjLocked(@OomAdjuster.OomAdjReason int oomAdjReason) {















        mOomAdjuster.updateOomAdjLocked(oomAdjReason);















    }























@@ -15629,7 +15629,8 @@ public class ActivityManagerService extends IActivityManager.Stub













     * @return whether updateOomAdjLocked(app) was successful.















     */















    @GuardedBy("this")













    final boolean updateOomAdjLocked(ProcessRecord app, String oomAdjReason) {













    final boolean updateOomAdjLocked(













            ProcessRecord app, @OomAdjuster.OomAdjReason int oomAdjReason) {















        return mOomAdjuster.updateOomAdjLocked(app, oomAdjReason);















    }
























@@ -15862,14 +15863,16 @@ public class ActivityManagerService extends IActivityManager.Stub













        mOomAdjuster.setUidTempAllowlistStateLSP(uid, onAllowlist);















    }



























    private void trimApplications(boolean forceFullOomAdj, String oomAdjReason) {













    private void trimApplications(













            boolean forceFullOomAdj, @OomAdjuster.OomAdjReason int oomAdjReason) {















        synchronized (this) {















            trimApplicationsLocked(forceFullOomAdj, oomAdjReason);















        }















    }





























    @GuardedBy("this")













    private void trimApplicationsLocked(boolean forceFullOomAdj, String oomAdjReason) {













    private void trimApplicationsLocked(













            boolean forceFullOomAdj, @OomAdjuster.OomAdjReason int oomAdjReason) {















        // First remove any unused application processes whose package















        // has been removed.















        boolean didSomething = false;

























services/core/java/com/android/server/am/CachedAppOptimizer.java



+5
−4




























Original line number
Diff line number
Diff line








@@ -1488,11 +1488,12 @@ public final class CachedAppOptimizer {













        public long mOrigAnonRss;















        public int mProcState;















        public int mOomAdj;













        public String mOomAdjReason;













        public @OomAdjuster.OomAdjReason int mOomAdjReason;































        SingleCompactionStats(long[] rss, CompactSource source, String processName,















                long deltaAnonRss, long zramConsumed, long anonMemFreed, long origAnonRss,













                long cpuTimeMillis, int procState, int oomAdj, String oomAdjReason) {













                long cpuTimeMillis, int procState, int oomAdj,













                @OomAdjuster.OomAdjReason int oomAdjReason) {















            mRssAfterCompaction = rss;















            mSourceType = source;















            mProcessName = processName;










@@ -1521,7 +1522,7 @@ public final class CachedAppOptimizer {













            pw.println("    (" + mProcessName + "," + mSourceType.name() + "," + mDeltaAnonRssKBs















                    + "," + mZramConsumedKBs + "," + mAnonMemFreedKBs + "," + getCompactEfficiency()















                    + "," + getCompactCost() + "," + mProcState + "," + mOomAdj + ","













                    + mOomAdjReason + ")");













                    + OomAdjuster.oomAdjReasonToString(mOomAdjReason) + ")");















        }















    }


























@@ -1693,7 +1694,7 @@ public final class CachedAppOptimizer {













                    boolean forceCompaction;















                    CompactSource compactSource;















                    CompactProfile requestedProfile;













                    String oomAdjReason;













                    int oomAdjReason;















                    synchronized (mProcLock) {















                        if (mPendingCompactionProcesses.isEmpty()) {















                            if (DEBUG_COMPACTION) {

































services/core/java/com/android/server/am/OomAdjuster.java



+108
−26




























Original line number
Diff line number
Diff line








@@ -76,9 +76,11 @@ import static com.android.server.am.PlatformCompatCache.CACHED_COMPAT_CHANGE_USE













import static com.android.server.am.ProcessList.TAG_PROCESS_OBSERVERS;















import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_SWITCH;





























import android.annotation.IntDef;















import android.annotation.Nullable;















import android.app.ActivityManager;















import android.app.ActivityThread;













import android.app.AppProtoEnums;















import android.app.ApplicationExitInfo;















import android.app.usage.UsageEvents;















import android.compat.annotation.ChangeId;










@@ -113,6 +115,8 @@ import com.android.server.wm.ActivityServiceConnectionsHolder;













import com.android.server.wm.WindowProcessController;































import java.io.PrintWriter;













import java.lang.annotation.Retention;













import java.lang.annotation.RetentionPolicy;















import java.util.ArrayDeque;















import java.util.ArrayList;















import java.util.Arrays;









@@ -122,20 +126,97 @@ import java.util.Arrays;













 */















public class OomAdjuster {















    static final String TAG = "OomAdjuster";













    static final String OOM_ADJ_REASON_METHOD = "updateOomAdj";













    static final String OOM_ADJ_REASON_NONE = OOM_ADJ_REASON_METHOD + "_meh";













    static final String OOM_ADJ_REASON_ACTIVITY = OOM_ADJ_REASON_METHOD + "_activityChange";













    static final String OOM_ADJ_REASON_FINISH_RECEIVER = OOM_ADJ_REASON_METHOD + "_finishReceiver";













    static final String OOM_ADJ_REASON_START_RECEIVER = OOM_ADJ_REASON_METHOD + "_startReceiver";













    static final String OOM_ADJ_REASON_BIND_SERVICE = OOM_ADJ_REASON_METHOD + "_bindService";













    static final String OOM_ADJ_REASON_UNBIND_SERVICE = OOM_ADJ_REASON_METHOD + "_unbindService";













    static final String OOM_ADJ_REASON_START_SERVICE = OOM_ADJ_REASON_METHOD + "_startService";













    static final String OOM_ADJ_REASON_GET_PROVIDER = OOM_ADJ_REASON_METHOD + "_getProvider";













    static final String OOM_ADJ_REASON_REMOVE_PROVIDER = OOM_ADJ_REASON_METHOD + "_removeProvider";













    static final String OOM_ADJ_REASON_UI_VISIBILITY = OOM_ADJ_REASON_METHOD + "_uiVisibility";













    static final String OOM_ADJ_REASON_ALLOWLIST = OOM_ADJ_REASON_METHOD + "_allowlistChange";













    static final String OOM_ADJ_REASON_PROCESS_BEGIN = OOM_ADJ_REASON_METHOD + "_processBegin";













    static final String OOM_ADJ_REASON_PROCESS_END = OOM_ADJ_REASON_METHOD + "_processEnd";



























    static final int OOM_ADJ_REASON_NONE = 0;













    static final int OOM_ADJ_REASON_ACTIVITY = 1;













    static final int OOM_ADJ_REASON_FINISH_RECEIVER = 2;













    static final int OOM_ADJ_REASON_START_RECEIVER = 3;













    static final int OOM_ADJ_REASON_BIND_SERVICE = 4;













    static final int OOM_ADJ_REASON_UNBIND_SERVICE = 5;













    static final int OOM_ADJ_REASON_START_SERVICE = 6;













    static final int OOM_ADJ_REASON_GET_PROVIDER = 7;













    static final int OOM_ADJ_REASON_REMOVE_PROVIDER = 8;













    static final int OOM_ADJ_REASON_UI_VISIBILITY = 9;













    static final int OOM_ADJ_REASON_ALLOWLIST = 10;













    static final int OOM_ADJ_REASON_PROCESS_BEGIN = 11;













    static final int OOM_ADJ_REASON_PROCESS_END = 12;



























    @IntDef(prefix = {"OOM_ADJ_REASON_"},













            value = {OOM_ADJ_REASON_NONE, OOM_ADJ_REASON_ACTIVITY, OOM_ADJ_REASON_FINISH_RECEIVER,













                    OOM_ADJ_REASON_START_RECEIVER, OOM_ADJ_REASON_BIND_SERVICE,













                    OOM_ADJ_REASON_UNBIND_SERVICE, OOM_ADJ_REASON_START_SERVICE,













                    OOM_ADJ_REASON_GET_PROVIDER, OOM_ADJ_REASON_REMOVE_PROVIDER,













                    OOM_ADJ_REASON_UI_VISIBILITY, OOM_ADJ_REASON_ALLOWLIST,













                    OOM_ADJ_REASON_PROCESS_BEGIN, OOM_ADJ_REASON_PROCESS_END})













    @Retention(RetentionPolicy.SOURCE)













    public @interface OomAdjReason {}



























    public static final int oomAdjReasonToProto(@OomAdjReason int oomReason) {













        switch (oomReason) {













            case OOM_ADJ_REASON_NONE:













                return AppProtoEnums.OOM_ADJ_REASON_NONE;













            case OOM_ADJ_REASON_ACTIVITY:













                return AppProtoEnums.OOM_ADJ_REASON_ACTIVITY;













            case OOM_ADJ_REASON_FINISH_RECEIVER:













                return AppProtoEnums.OOM_ADJ_REASON_FINISH_RECEIVER;













            case OOM_ADJ_REASON_START_RECEIVER:













                return AppProtoEnums.OOM_ADJ_REASON_START_RECEIVER;













            case OOM_ADJ_REASON_BIND_SERVICE:













                return AppProtoEnums.OOM_ADJ_REASON_BIND_SERVICE;













            case OOM_ADJ_REASON_UNBIND_SERVICE:













                return AppProtoEnums.OOM_ADJ_REASON_UNBIND_SERVICE;













            case OOM_ADJ_REASON_START_SERVICE:













                return AppProtoEnums.OOM_ADJ_REASON_START_SERVICE;













            case OOM_ADJ_REASON_GET_PROVIDER:













                return AppProtoEnums.OOM_ADJ_REASON_GET_PROVIDER;













            case OOM_ADJ_REASON_REMOVE_PROVIDER:













                return AppProtoEnums.OOM_ADJ_REASON_REMOVE_PROVIDER;













            case OOM_ADJ_REASON_UI_VISIBILITY:













                return AppProtoEnums.OOM_ADJ_REASON_UI_VISIBILITY;













            case OOM_ADJ_REASON_ALLOWLIST:













                return AppProtoEnums.OOM_ADJ_REASON_ALLOWLIST;













            case OOM_ADJ_REASON_PROCESS_BEGIN:













                return AppProtoEnums.OOM_ADJ_REASON_PROCESS_BEGIN;













            case OOM_ADJ_REASON_PROCESS_END:













                return AppProtoEnums.OOM_ADJ_REASON_PROCESS_END;













            default:













                return AppProtoEnums.OOM_ADJ_REASON_UNKNOWN_TO_PROTO;













        }













    }



























    public static final String oomAdjReasonToString(@OomAdjReason int oomReason) {













        final String OOM_ADJ_REASON_METHOD = "updateOomAdj";













        switch (oomReason) {













            case OOM_ADJ_REASON_NONE:













                return OOM_ADJ_REASON_METHOD + "_meh";













            case OOM_ADJ_REASON_ACTIVITY:













                return OOM_ADJ_REASON_METHOD + "_activityChange";













            case OOM_ADJ_REASON_FINISH_RECEIVER:













                return OOM_ADJ_REASON_METHOD + "_finishReceiver";













            case OOM_ADJ_REASON_START_RECEIVER:













                return OOM_ADJ_REASON_METHOD + "_startReceiver";













            case OOM_ADJ_REASON_BIND_SERVICE:













                return OOM_ADJ_REASON_METHOD + "_bindService";













            case OOM_ADJ_REASON_UNBIND_SERVICE:













                return OOM_ADJ_REASON_METHOD + "_unbindService";













            case OOM_ADJ_REASON_START_SERVICE:













                return OOM_ADJ_REASON_METHOD + "_startService";













            case OOM_ADJ_REASON_GET_PROVIDER:













                return OOM_ADJ_REASON_METHOD + "_getProvider";













            case OOM_ADJ_REASON_REMOVE_PROVIDER:













                return OOM_ADJ_REASON_METHOD + "_removeProvider";













            case OOM_ADJ_REASON_UI_VISIBILITY:













                return OOM_ADJ_REASON_METHOD + "_uiVisibility";













            case OOM_ADJ_REASON_ALLOWLIST:













                return OOM_ADJ_REASON_METHOD + "_allowlistChange";













            case OOM_ADJ_REASON_PROCESS_BEGIN:













                return OOM_ADJ_REASON_METHOD + "_processBegin";













            case OOM_ADJ_REASON_PROCESS_END:













                return OOM_ADJ_REASON_METHOD + "_processEnd";













            default:













                return "_unknown";













        }













    }































    /**















     * Flag {@link android.content.Context#BIND_INCLUDE_CAPABILITIES} is used










@@ -418,14 +499,14 @@ public class OomAdjuster {













     * Update OomAdj for all processes in LRU list















     */















    @GuardedBy("mService")













    void updateOomAdjLocked(String oomAdjReason) {













    void updateOomAdjLocked(@OomAdjReason int oomAdjReason) {















        synchronized (mProcLock) {















            updateOomAdjLSP(oomAdjReason);















        }















    }































    @GuardedBy({"mService", "mProcLock"})













    private void updateOomAdjLSP(String oomAdjReason) {













    private void updateOomAdjLSP(@OomAdjReason int oomAdjReason) {















        if (checkAndEnqueueOomAdjTargetLocked(null)) {















            // Simply return as there is an oomAdjUpdate ongoing















            return;









@@ -441,7 +522,7 @@ public class OomAdjuster {













    }































    @GuardedBy({"mService", "mProcLock"})













    private void performUpdateOomAdjLSP(String oomAdjReason) {













    private void performUpdateOomAdjLSP(@OomAdjReason int oomAdjReason) {















        final ProcessRecord topApp = mService.getTopApp();















        // Clear any pending ones because we are doing a full update now.















        mPendingProcessSet.clear();









@@ -458,14 +539,14 @@ public class OomAdjuster {













     * @param oomAdjReason















     */















    @GuardedBy("mService")













    boolean updateOomAdjLocked(ProcessRecord app, String oomAdjReason) {













    boolean updateOomAdjLocked(ProcessRecord app, @OomAdjReason int oomAdjReason) {















        synchronized (mProcLock) {















            return updateOomAdjLSP(app, oomAdjReason);















        }















    }































    @GuardedBy({"mService", "mProcLock"})













    private boolean updateOomAdjLSP(ProcessRecord app, String oomAdjReason) {













    private boolean updateOomAdjLSP(ProcessRecord app, @OomAdjReason int oomAdjReason) {















        if (app == null || !mConstants.OOMADJ_UPDATE_QUICK) {















            updateOomAdjLSP(oomAdjReason);















            return true;









@@ -487,10 +568,10 @@ public class OomAdjuster {













    }































    @GuardedBy({"mService", "mProcLock"})













    private boolean performUpdateOomAdjLSP(ProcessRecord app, String oomAdjReason) {













    private boolean performUpdateOomAdjLSP(ProcessRecord app, @OomAdjReason int oomAdjReason) {















        final ProcessRecord topApp = mService.getTopApp();





























        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, oomAdjReason);













        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, oomAdjReasonToString(oomAdjReason));















        mService.mOomAdjProfiler.oomAdjStarted();















        mAdjSeq++;


























@@ -689,7 +770,7 @@ public class OomAdjuster {













     * {@link #enqueueOomAdjTargetLocked}.















     */















    @GuardedBy("mService")













    void updateOomAdjPendingTargetsLocked(String oomAdjReason) {













    void updateOomAdjPendingTargetsLocked(@OomAdjReason int oomAdjReason) {















        // First check if there is pending full update















        if (mPendingFullOomAdjUpdate) {















            mPendingFullOomAdjUpdate = false;










@@ -717,10 +798,11 @@ public class OomAdjuster {













    }































    @GuardedBy("mService")













    private void performUpdateOomAdjPendingTargetsLocked(String oomAdjReason) {













    private void performUpdateOomAdjPendingTargetsLocked(













            @OomAdjuster.OomAdjReason int oomAdjReason) {















        final ProcessRecord topApp = mService.getTopApp();





























        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, oomAdjReason);













        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, oomAdjReasonToString(oomAdjReason));















        mService.mOomAdjProfiler.oomAdjStarted();































        final ArrayList<ProcessRecord> processes = mTmpProcessList;









@@ -742,11 +824,11 @@ public class OomAdjuster {













     * get evaluated recursively here.















     */















    @GuardedBy({"mService", "mProcLock"})













    private void updateOomAdjInnerLSP(String oomAdjReason, final ProcessRecord topApp,













    private void updateOomAdjInnerLSP(@OomAdjReason int oomAdjReason, final ProcessRecord topApp,















            ArrayList<ProcessRecord> processes, ActiveUids uids, boolean potentialCycles,















            boolean startProfiling) {















        if (startProfiling) {













            Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, oomAdjReason);













            Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, oomAdjReasonToString(oomAdjReason));















            mService.mOomAdjProfiler.oomAdjStarted();















        }















        final long now = SystemClock.uptimeMillis();

































services/core/java/com/android/server/am/ProcessCachedOptimizerRecord.java



+4
−3




























Original line number
Diff line number
Diff line








@@ -51,7 +51,7 @@ final class ProcessCachedOptimizerRecord {













    /**















     * Last oom adjust change reason for this app.















     */













    @GuardedBy("mProcLock") private String mLastOomAdjChangeReason;













    @GuardedBy("mProcLock") private @OomAdjuster.OomAdjReason int mLastOomAdjChangeReason;































    /**















     * The most recent compaction action performed for this app.










@@ -133,12 +133,13 @@ final class ProcessCachedOptimizerRecord {













    }































    @GuardedBy("mProcLock")













    void setLastOomAdjChangeReason(String reason) {













    void setLastOomAdjChangeReason(@OomAdjuster.OomAdjReason int reason) {















        mLastOomAdjChangeReason = reason;















    }































    @GuardedBy("mProcLock")













    String getLastOomAdjChangeReason() {













    @OomAdjuster.OomAdjReason













    int getLastOomAdjChangeReason() {















        return mLastOomAdjChangeReason;















    }