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

Commit 1cff69d2 authored by Rafal Slawik's avatar Rafal Slawik
Browse files

Do not keep the input array with CPU times 

CpuTimePerUidFreq puller kept the input array with CPU times to avoid
copies, but that array is owned by the reader and is mutated for each
callback invocation. This corrupted the aggregated data.

Bug: 157535126
Test: cmd stats pull-source 10010
Test: atest CpuStatsTests
Change-Id: Icda6a71f558e582c5d5b497e2cca1d84deed8b99
Merged-In: Icda6a71f558e582c5d5b497e2cca1d84deed8b99
parent 8f5e0002

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+8 −19
Original line number Diff line number Diff line
@@ -1565,9 +1565,6 @@ public class StatsPullAtomService extends SystemService { 
        // Aggregate times for the same uids.

        SparseArray<long[]> aggregated = new SparseArray<>();

        mCpuUidFreqTimeReader.readAbsolute((uid, cpuFreqTimeMs) -> {

            // For uids known to be aggregated from many entries allow mutating in place to avoid

            // many copies. Otherwise, copy before aggregating.

            boolean mutateInPlace = false;

            if (UserHandle.isIsolated(uid)) {

                // Skip individual isolated uids because they are recycled and quickly removed from

                // the underlying data source.
@@ -1575,27 +1572,19 @@ public class StatsPullAtomService extends SystemService { 
            } else if (UserHandle.isSharedAppGid(uid)) {

                // All shared app gids are accounted together.

                uid = LAST_SHARED_APPLICATION_GID;

                mutateInPlace = true;

            } else if (UserHandle.isApp(uid)) {

                // Apps are accounted under their app id.

            } else {

                // Everything else is accounted under their base uid.

                uid = UserHandle.getAppId(uid);

            }



            long[] aggCpuFreqTimeMs = aggregated.get(uid);

            if (aggCpuFreqTimeMs != null) {

                if (!mutateInPlace) {

                    aggCpuFreqTimeMs = Arrays.copyOf(aggCpuFreqTimeMs, cpuFreqTimeMs.length);

            if (aggCpuFreqTimeMs == null) {

                aggCpuFreqTimeMs = new long[cpuFreqTimeMs.length];

                aggregated.put(uid, aggCpuFreqTimeMs);

            }

            for (int freqIndex = 0; freqIndex < cpuFreqTimeMs.length; ++freqIndex) {

                aggCpuFreqTimeMs[freqIndex] += cpuFreqTimeMs[freqIndex];

            }

            } else {

                if (mutateInPlace) {

                    cpuFreqTimeMs = Arrays.copyOf(cpuFreqTimeMs, cpuFreqTimeMs.length);

                }

                aggregated.put(uid, cpuFreqTimeMs);

            }

        });



        int size = aggregated.size();