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

Commit ff0d1c1a authored by Ioannis Ilkos's avatar Ioannis Ilkos
Browse files

Remove processMemoryState puller. 

This puller is no longer needed as the data is now collected via processMemorySnapshot

Flag: EXEMPT METRICS
Bug: 439506497
Change-Id: I0141c32073129fab5a7e9b68ccd428ac56a1358f
parent 3360b8ce

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

+0 −38
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ import static com.android.internal.util.FrameworkStatsLog.TIME_ZONE_DETECTOR_STA 
import static com.android.internal.util.FrameworkStatsLog.TIME_ZONE_DETECTOR_STATE__DETECTION_MODE__MANUAL;

import static com.android.internal.util.FrameworkStatsLog.TIME_ZONE_DETECTOR_STATE__DETECTION_MODE__TELEPHONY;

import static com.android.internal.util.FrameworkStatsLog.TIME_ZONE_DETECTOR_STATE__DETECTION_MODE__UNKNOWN;

import static com.android.server.am.MemoryStatUtil.readMemoryStatFromFilesystem;

import static com.android.server.stats.Flags.addMobileBytesTransferByProcStatePuller;

import static com.android.server.stats.pull.IonMemoryUtil.readProcessSystemIonHeapSizesFromDebugfs;

import static com.android.server.stats.pull.IonMemoryUtil.readSystemIonHeapSizeFromDebugfs;
@@ -489,7 +488,6 @@ public class StatsPullAtomService extends SystemService { 
    private final Object mUwbActivityInfoLock = new Object();

    private final Object mSystemElapsedRealtimeLock = new Object();

    private final Object mSystemUptimeLock = new Object();

    private final Object mProcessMemoryStateLock = new Object();

    private final Object mProcessMemoryHighWaterMarkLock = new Object();

    private final Object mSystemIonHeapSizeLock = new Object();

    private final Object mIonHeapSizeLock = new Object();
@@ -644,10 +642,6 @@ public class StatsPullAtomService extends SystemService { 
                        synchronized (mSystemUptimeLock) {

                            return pullSystemUptimeLocked(atomTag, data);

                        }

                    case FrameworkStatsLog.PROCESS_MEMORY_STATE:

                        synchronized (mProcessMemoryStateLock) {

                            return pullProcessMemoryStateLocked(atomTag, data);

                        }

                    case FrameworkStatsLog.PROCESS_MEMORY_HIGH_WATER_MARK:

                        synchronized (mProcessMemoryHighWaterMarkLock) {

                            return pullProcessMemoryHighWaterMarkLocked(atomTag, data);
@@ -1003,7 +997,6 @@ public class StatsPullAtomService extends SystemService { 
        registerBluetoothActivityInfo();

        registerSystemElapsedRealtime();

        registerSystemUptime();

        registerProcessMemoryState();

        registerProcessMemoryHighWaterMark();

        registerProcessMemorySnapshot();

        registerSystemIonHeapSize();
@@ -2501,37 +2494,6 @@ public class StatsPullAtomService extends SystemService { 
        return StatsManager.PULL_SUCCESS;

    }



    private void registerProcessMemoryState() {

        int tagId = FrameworkStatsLog.PROCESS_MEMORY_STATE;

        PullAtomMetadata metadata = new PullAtomMetadata.Builder()

                .setAdditiveFields(new int[]{4, 5, 6, 7, 8})

                .build();

        mStatsManager.setPullAtomCallback(

                tagId,

                metadata,

                DIRECT_EXECUTOR,

                mStatsCallbackImpl

        );

    }



    int pullProcessMemoryStateLocked(int atomTag, List<StatsEvent> pulledData) {

        List<ProcessMemoryState> processMemoryStates =

                LocalServices.getService(ActivityManagerInternal.class)

                        .getMemoryStateForProcesses();

        for (ProcessMemoryState processMemoryState : processMemoryStates) {

            final MemoryStat memoryStat = readMemoryStatFromFilesystem(processMemoryState.uid,

                    processMemoryState.pid);

            if (memoryStat == null) {

                continue;

            }

            pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, processMemoryState.uid,

                    processMemoryState.processName, processMemoryState.oomScore, memoryStat.pgfault,

                    memoryStat.pgmajfault, memoryStat.rssInBytes, memoryStat.cacheInBytes,

                    memoryStat.swapInBytes, -1 /*unused*/, -1 /*unused*/, -1 /*unused*/));

        }

        return StatsManager.PULL_SUCCESS;

    }



    private void registerProcessMemoryHighWaterMark() {

        int tagId = FrameworkStatsLog.PROCESS_MEMORY_HIGH_WATER_MARK;

        mStatsManager.setPullAtomCallback(