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

Commit c9a65383 authored by Jing Ji's avatar Jing Ji
Browse files

Relax the lock in getMemoryStateForProcesses 

Metrics need to be pulled in time while the lock could delay that.
The oom adj score in the returned data set could be inconsitent
from the actual one but other data fields are not and it's preferrable
to pull them.

Bug: 192440905
Test: atest CtsStatsdAtomHostTestCases:ProcessMemoryStatsTests
Change-Id: I055b8baa87d53114de51b65e3f483635441e5ddc
parent 2ce2d91d

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

+5 −7
Original line number Diff line number Diff line
@@ -15557,7 +15557,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
        @Override

        public List<ProcessMemoryState> getMemoryStateForProcesses() {

            List<ProcessMemoryState> processMemoryStates = new ArrayList<>();

            synchronized (mProcLock) {

            synchronized (mPidsSelfLocked) {

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

                    final ProcessRecord r = mPidsSelfLocked.valueAt(i);
@@ -15565,7 +15564,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
                            r.uid, r.getPid(), r.processName, r.mState.getCurAdj()));

                }

            }

            }

            return processMemoryStates;

        }