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

Commit 0bf0398e authored by Edgar Arriaga's avatar Edgar Arriaga
Browse files

Remove wasteful bfgs and services compaction flows 

bfgs and persistent processes tend to over trigger compactions
this is a followup patch as we moved the compaction flow to be
based on freezer triggering so there is no need for these flows.

Bug: 274013197
Test: Manual
Change-Id: If2614951b81347f8fe7d11ff678f4cc8069f85e4
parent 2b18b219

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

+2 −2
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ final class ActivityManagerShellCommand extends ShellCommand { 
                synchronized (mInternal.mProcLock) {

                    mInternal.mOomAdjuster.mCachedAppOptimizer.compactApp(app,

                            CachedAppOptimizer.CompactProfile.FULL,

                            CachedAppOptimizer.CompactSource.APP, true);

                            CachedAppOptimizer.CompactSource.SHELL, true);

                }

                pw.println("Finished full compaction for " + app.mPid);

            } else if (isSomeCompact) {
@@ -1101,7 +1101,7 @@ final class ActivityManagerShellCommand extends ShellCommand { 
                synchronized (mInternal.mProcLock) {

                    mInternal.mOomAdjuster.mCachedAppOptimizer.compactApp(app,

                            CachedAppOptimizer.CompactProfile.SOME,

                            CachedAppOptimizer.CompactSource.APP, true);

                            CachedAppOptimizer.CompactSource.SHELL, true);

                }

                pw.println("Finished some compaction for " + app.mPid);

            }

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

+2 −44
Original line number Diff line number Diff line
@@ -226,8 +226,8 @@ public final class CachedAppOptimizer { 
        FULL // File+anon compaction

    }



    // This indicates the process OOM memory state that initiated the compaction request

    public enum CompactSource { APP, PERSISTENT, BFGS }

    // This indicates who initiated the compaction request

    public enum CompactSource { APP, SHELL }



    public enum CancelCompactReason {

        SCREEN_ON, // screen was turned on which cancels all compactions.
@@ -373,10 +373,6 @@ public final class CachedAppOptimizer { 
    @GuardedBy("mPhenotypeFlagLock")

    @VisibleForTesting volatile long mCompactThrottleFullFull = DEFAULT_COMPACT_THROTTLE_4;

    @GuardedBy("mPhenotypeFlagLock")

    @VisibleForTesting volatile long mCompactThrottleBFGS = DEFAULT_COMPACT_THROTTLE_5;

    @GuardedBy("mPhenotypeFlagLock")

    @VisibleForTesting volatile long mCompactThrottlePersistent = DEFAULT_COMPACT_THROTTLE_6;

    @GuardedBy("mPhenotypeFlagLock")

    @VisibleForTesting volatile long mCompactThrottleMinOomAdj =

            DEFAULT_COMPACT_THROTTLE_MIN_OOM_ADJ;

    @GuardedBy("mPhenotypeFlagLock")
@@ -635,8 +631,6 @@ public final class CachedAppOptimizer { 
            pw.println("  " + KEY_COMPACT_THROTTLE_2 + "=" + mCompactThrottleSomeFull);

            pw.println("  " + KEY_COMPACT_THROTTLE_3 + "=" + mCompactThrottleFullSome);

            pw.println("  " + KEY_COMPACT_THROTTLE_4 + "=" + mCompactThrottleFullFull);

            pw.println("  " + KEY_COMPACT_THROTTLE_5 + "=" + mCompactThrottleBFGS);

            pw.println("  " + KEY_COMPACT_THROTTLE_6 + "=" + mCompactThrottlePersistent);

            pw.println("  " + KEY_COMPACT_THROTTLE_MIN_OOM_ADJ + "=" + mCompactThrottleMinOomAdj);

            pw.println("  " + KEY_COMPACT_THROTTLE_MAX_OOM_ADJ + "=" + mCompactThrottleMaxOomAdj);

            pw.println("  " + KEY_COMPACT_STATSD_SAMPLE_RATE + "=" + mCompactStatsdSampleRate);
@@ -804,18 +798,6 @@ public final class CachedAppOptimizer { 
        return stats;

    }



    @GuardedBy("mProcLock")

    boolean shouldCompactPersistent(ProcessRecord app, long now) {

        return (app.mOptRecord.getLastCompactTime() == 0

                || (now - app.mOptRecord.getLastCompactTime()) > mCompactThrottlePersistent);

    }



    @GuardedBy("mProcLock")

    boolean shouldCompactBFGS(ProcessRecord app, long now) {

        return (app.mOptRecord.getLastCompactTime() == 0

                || (now - app.mOptRecord.getLastCompactTime()) > mCompactThrottleBFGS);

    }



    void compactAllSystem() {

        if (useCompaction()) {

            if (DEBUG_COMPACTION) {
@@ -1103,8 +1085,6 @@ public final class CachedAppOptimizer { 
                mCompactThrottleSomeFull = Integer.parseInt(throttleSomeFullFlag);

                mCompactThrottleFullSome = Integer.parseInt(throttleFullSomeFlag);

                mCompactThrottleFullFull = Integer.parseInt(throttleFullFullFlag);

                mCompactThrottleBFGS = Integer.parseInt(throttleBFGSFlag);

                mCompactThrottlePersistent = Integer.parseInt(throttlePersistentFlag);

                mCompactThrottleMinOomAdj = Long.parseLong(throttleMinOomAdjFlag);

                mCompactThrottleMaxOomAdj = Long.parseLong(throttleMaxOomAdjFlag);

            } catch (NumberFormatException e) {
@@ -1117,8 +1097,6 @@ public final class CachedAppOptimizer { 
            mCompactThrottleSomeFull = DEFAULT_COMPACT_THROTTLE_2;

            mCompactThrottleFullSome = DEFAULT_COMPACT_THROTTLE_3;

            mCompactThrottleFullFull = DEFAULT_COMPACT_THROTTLE_4;

            mCompactThrottleBFGS = DEFAULT_COMPACT_THROTTLE_5;

            mCompactThrottlePersistent = DEFAULT_COMPACT_THROTTLE_6;

            mCompactThrottleMinOomAdj = DEFAULT_COMPACT_THROTTLE_MIN_OOM_ADJ;

            mCompactThrottleMaxOomAdj = DEFAULT_COMPACT_THROTTLE_MAX_OOM_ADJ;

        }
@@ -1660,26 +1638,6 @@ public final class CachedAppOptimizer { 
                            return true;

                        }

                    }

                } else if (source == CompactSource.PERSISTENT) {

                    if (start - lastCompactTime < mCompactThrottlePersistent) {

                        if (DEBUG_COMPACTION) {

                            Slog.d(TAG_AM,

                                    "Skipping persistent compaction for " + name

                                            + ": too soon. throttle=" + mCompactThrottlePersistent

                                            + " last=" + (start - lastCompactTime) + "ms ago");

                        }

                        return true;

                    }

                } else if (source == CompactSource.BFGS) {

                    if (start - lastCompactTime < mCompactThrottleBFGS) {

                        if (DEBUG_COMPACTION) {

                            Slog.d(TAG_AM,

                                    "Skipping bfgs compaction for " + name

                                            + ": too soon. throttle=" + mCompactThrottleBFGS

                                            + " last=" + (start - lastCompactTime) + "ms ago");

                        }

                        return true;

                    }

                }

            }

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

+0 −24
Original line number Diff line number Diff line
@@ -2940,30 +2940,6 @@ public class OomAdjuster { 
            mCachedAppOptimizer.onOomAdjustChanged(state.getSetAdj(), state.getCurAdj(), app);

        }



        // don't compact during bootup

        if (mCachedAppOptimizer.useCompaction() && mService.mBooted) {

            // Cached and prev/home compaction

            // reminder: here, setAdj is previous state, curAdj is upcoming state

            if (mService.mWakefulness.get() != PowerManagerInternal.WAKEFULNESS_AWAKE) {

                // See if we can compact persistent and bfgs services now that screen is off

                if (state.getSetAdj() < FOREGROUND_APP_ADJ

                        && !state.isRunningRemoteAnimation()

                        // Because these can fire independent of oom_adj/procstate changes, we need

                        // to throttle the actual dispatch of these requests in addition to the

                        // processing of the requests. As a result, there is throttling both here

                        // and in CachedAppOptimizer.

                        && mCachedAppOptimizer.shouldCompactPersistent(app, now)) {

                    mCachedAppOptimizer.compactApp(app, CachedAppOptimizer.CompactProfile.FULL,

                            CachedAppOptimizer.CompactSource.PERSISTENT, false);

                } else if (state.getCurProcState()

                                == ActivityManager.PROCESS_STATE_BOUND_FOREGROUND_SERVICE

                        && mCachedAppOptimizer.shouldCompactBFGS(app, now)) {

                    mCachedAppOptimizer.compactApp(app, CachedAppOptimizer.CompactProfile.FULL,

                            CachedAppOptimizer.CompactSource.BFGS, false);

                }

            }

        }



        if (state.getCurAdj() != state.getSetAdj()) {

            ProcessList.setOomAdj(app.getPid(), app.uid, state.getCurAdj());

            if (DEBUG_SWITCH || DEBUG_OOM_ADJ || mService.mCurOomAdjUid == app.info.uid) {

services/tests/mockingservicestests/src/com/android/server/am/CachedAppOptimizerTest.java

+0 −40
Original line number Diff line number Diff line
@@ -166,10 +166,6 @@ public final class CachedAppOptimizerTest { 
                    CachedAppOptimizer.DEFAULT_STATSD_SAMPLE_RATE);

            assertThat(mCachedAppOptimizerUnderTest.mFreezerStatsdSampleRate).isEqualTo(

                    CachedAppOptimizer.DEFAULT_STATSD_SAMPLE_RATE);

            assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo(

                    CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5);

            assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo(

                    CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6);

            assertThat(mCachedAppOptimizerUnderTest.mFullAnonRssThrottleKb).isEqualTo(

                    CachedAppOptimizer.DEFAULT_COMPACT_FULL_RSS_THROTTLE_KB);

            assertThat(mCachedAppOptimizerUnderTest.mFullDeltaRssThrottleKb).isEqualTo(
@@ -261,10 +257,6 @@ public final class CachedAppOptimizerTest { 
                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3 + 1);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4 + 1);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5 + 1);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6 + 1);

        assertThat(mCachedAppOptimizerUnderTest.mFullDeltaRssThrottleKb).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_FULL_DELTA_RSS_THROTTLE_KB + 1);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleMinOomAdj).isEqualTo(
@@ -275,10 +267,6 @@ public final class CachedAppOptimizerTest { 
                CachedAppOptimizer.DEFAULT_STATSD_SAMPLE_RATE + 0.1f);

        assertThat(mCachedAppOptimizerUnderTest.mFreezerStatsdSampleRate).isEqualTo(

                CachedAppOptimizer.DEFAULT_STATSD_SAMPLE_RATE + 0.1f);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5 + 1);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6 + 1);

        assertThat(mCachedAppOptimizerUnderTest.mFullAnonRssThrottleKb).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_FULL_RSS_THROTTLE_KB + 1);

        assertThat(mCachedAppOptimizerUnderTest.mProcStateThrottle).containsExactly(1, 2, 3);
@@ -425,10 +413,6 @@ public final class CachedAppOptimizerTest { 
                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3 + 1);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4 + 1);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5 + 1);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6 + 1);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleMinOomAdj).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_MIN_OOM_ADJ + 1);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleMaxOomAdj).isEqualTo(
@@ -454,10 +438,6 @@ public final class CachedAppOptimizerTest { 
                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6);



        // Repeat for each of the throttle keys.

        mCountDown = new CountDownLatch(1);
@@ -472,10 +452,6 @@ public final class CachedAppOptimizerTest { 
                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6);



        mCountDown = new CountDownLatch(1);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
@@ -489,10 +465,6 @@ public final class CachedAppOptimizerTest { 
                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6);



        mCountDown = new CountDownLatch(1);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
@@ -506,10 +478,6 @@ public final class CachedAppOptimizerTest { 
                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6);



        mCountDown = new CountDownLatch(1);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
@@ -523,10 +491,6 @@ public final class CachedAppOptimizerTest { 
                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6);



        mCountDown = new CountDownLatch(1);

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER,
@@ -540,10 +504,6 @@ public final class CachedAppOptimizerTest { 
                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_3);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleFullFull).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_4);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottleBFGS).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_5);

        assertThat(mCachedAppOptimizerUnderTest.mCompactThrottlePersistent).isEqualTo(

                CachedAppOptimizer.DEFAULT_COMPACT_THROTTLE_6);

    }



    @Test