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

Commit a9899304 authored by Jeffrey Huang's avatar Jeffrey Huang
Browse files

Migrate pullCpuTimePerUidFreq 

Test: No CTS test. Ran adb shell cmd stats pull-source 10010
Change-Id: I3403affab04b46e88148f46b7fce7962b244f95a
parent d5f053ed

apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java

+0 −22
Original line number Diff line number Diff line
@@ -761,23 +761,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
        }

    }



    private void pullKernelUidCpuFreqTime(

            int tagId, long elapsedNanos, long wallClockNanos,

            List<StatsLogEventWrapper> pulledData) {

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

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

                if (cpuFreqTimeMs[freqIndex] != 0) {

                    StatsLogEventWrapper e = new StatsLogEventWrapper(tagId, elapsedNanos,

                            wallClockNanos);

                    e.writeInt(uid);

                    e.writeInt(freqIndex);

                    e.writeLong(cpuFreqTimeMs[freqIndex]);

                    pulledData.add(e);

                }

            }

        });

    }



    private void pullKernelUidCpuClusterTime(

            int tagId, long elapsedNanos, long wallClockNanos,

            List<StatsLogEventWrapper> pulledData) {
@@ -2097,11 +2080,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
                break;

            }



            case StatsLog.CPU_TIME_PER_UID_FREQ: {

                pullKernelUidCpuFreqTime(tagId, elapsedNanos, wallClockNanos, ret);

                break;

            }



            case StatsLog.CPU_CLUSTER_TIME: {

                pullKernelUidCpuClusterTime(tagId, elapsedNanos, wallClockNanos, ret);

                break;

cmds/statsd/src/external/StatsPullerManager.cpp

+0 −7
Original line number Diff line number Diff line
@@ -72,13 +72,6 @@ std::map<PullerKey, PullAtomInfo> StatsPullerManager::kAllPullAtomInfo = { 
        {{.atomTag = android::util::ON_DEVICE_POWER_MEASUREMENT},

         {.puller = new PowerStatsPuller()}},



        // cpu_time_per_uid_freq

        // the throttling is 3sec, handled in

        // frameworks/base/core/java/com/android/internal/os/KernelCpuProcReader

        {{.atomTag = android::util::CPU_TIME_PER_UID_FREQ},

         {.additiveFields = {4},

          .puller = new StatsCompanionServicePuller(android::util::CPU_TIME_PER_UID_FREQ)}},



        // cpu_active_time

        // the throttling is 3sec, handled in

        // frameworks/base/core/java/com/android/internal/os/KernelCpuProcReader

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

+29 −3
Original line number Diff line number Diff line
@@ -634,6 +634,8 @@ public class StatsPullAtomService extends SystemService { 
    // Disables throttler on CPU time readers.

    private KernelCpuUidUserSysTimeReader mCpuUidUserSysTimeReader =

            new KernelCpuUidUserSysTimeReader(false);

    private KernelCpuUidFreqTimeReader mCpuUidFreqTimeReader =

            new KernelCpuUidFreqTimeReader(false);



    private void registerCpuTimePerFreq() {

        int tagId = StatsLog.CPU_TIME_PER_FREQ;
@@ -694,11 +696,35 @@ public class StatsPullAtomService extends SystemService { 
    }



    private void registerCpuTimePerUidFreq() {

        // No op.

        // the throttling is 3sec, handled in

        // frameworks/base/core/java/com/android/internal/os/KernelCpuProcReader

        int tagId = StatsLog.CPU_TIME_PER_UID_FREQ;

        PullAtomMetadata metadata = PullAtomMetadata.newBuilder()

                .setAdditiveFields(new int[] {4})

                .build();

        mStatsManager.registerPullAtomCallback(

                tagId,

                metadata,

                (atomTag, data) -> pullCpuTimeperUidFreq(atomTag, data),

                Executors.newSingleThreadExecutor()

        );

    }



    private void pullCpuTimeperUidFreq() {

        // No op.

    private int pullCpuTimeperUidFreq(int atomTag, List<StatsEvent> pulledData) {

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

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

                if (cpuFreqTimeMs[freqIndex] != 0) {

                    StatsEvent e = StatsEvent.newBuilder()

                            .setAtomId(atomTag)

                            .writeInt(uid)

                            .writeInt(freqIndex)

                            .writeLong(cpuFreqTimeMs[freqIndex])

                            .build();

                    pulledData.add(e);

                }

            }

        });

        return StatsManager.PULL_SUCCESS;

    }



    private void registerCpuActiveTime() {