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

Commit 6c638e57 authored by Michael Wachenschwanz's avatar Michael Wachenschwanz
Browse files

Consolidate the collectReachable algorithm to one implementation 

Any discrepencies in what different alogrithms consider reachable could
cause difficult to identify bugs. Consolidating to one implementation
guarentees the concept of "reachablity" remain consistent.

Flag: com.android.server.am.consolidate_collect_reachable
Fixes: 364936739
Test: atest MockingOomAdjusterTests
Test: atest BroadcastQueueTest
Change-Id: If64bc46b4814a2dfa018ab6c4b35f94d80d683da
parent 30f73993

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

+20 −4
Original line number Diff line number Diff line
@@ -670,6 +670,14 @@ public abstract class OomAdjuster { 
        return topProcessState;

    }



    /**

     * Expand the provided {@code reachables} list with all processes reachable from those

     * provided in the list.

     */

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

    protected abstract void collectReachableProcessesLSP(

            @NonNull ArrayList<ProcessRecord> reachables);



    /**

     * Collect the reachable processes from the given {@code apps}, the result will be

     * returned in the given {@code processes}, which will include the processes from
@@ -2562,10 +2570,18 @@ public abstract class OomAdjuster { 
        }



        final ArrayList<ProcessRecord> processes = mTmpProcessList;



        if (Flags.consolidateCollectReachable()) {

            processes.add(app);

            synchronized (mProcLock) {

                collectReachableProcessesLSP(processes);

            }

        } else {

            final ActiveUids uids = mTmpUidRecords;

            mTmpProcessSet.add(app);

            collectReachableProcessesLocked(mTmpProcessSet, processes, uids);

            mTmpProcessSet.clear();

        }

        // Now processes contains app's downstream and app

        final int size = processes.size();

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

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

+10 −0
Original line number Diff line number Diff line
@@ -1095,6 +1095,16 @@ public class OomAdjusterImpl extends OomAdjuster { 
        postUpdateOomAdjInnerLSP(oomAdjReason, activeUids, now, nowElapsed, oldTime, false);

    }



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

    @Override

    protected void collectReachableProcessesLSP(@NonNull ArrayList<ProcessRecord> reachables) {

        collectAndMarkReachableProcessesLSP(reachables);

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

            final ProcessStateRecord state = reachables.get(i).mState;

            state.setReachable(false);

        }

    }



    /**

     * Mark all processes reachable from the {@code reachables} processes and add them to the

     * provided {@code reachables} list (targets excluded).

services/core/java/com/android/server/am/flags.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -340,3 +340,13 @@ flag { 
    description: "Limit the number of logcat logs included to fit in dropbox entries"

    bug: "354138103"

}



flag {

    name: "consolidate_collect_reachable"

    namespace: "backstage_power"

    description: "Consolidate collectReachable usage to one implementation."

    bug: "364936739"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}
 
 No newline at end of file