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

Commit d32a5135 authored by Marcin Oczeretko's avatar Marcin Oczeretko
Browse files

LooperStats - add debug entries to output for data validation 

Test: UT and manually verified that debug entries are included in
adb shell dumpsys looper_stats

Change-Id: Ie2166974cffd18a719aaa06f6e3525eb0337d2a1
parent 68060c69

core/java/com/android/internal/os/LooperStats.java

+18 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ public class LooperStats implements Looper.Observer { 
    private int mSamplingInterval;

    private CachedDeviceState.Readonly mDeviceState;

    private long mStartTime = System.currentTimeMillis();

    private boolean mAddDebugEntries = false;



    public LooperStats(int samplingInterval, int entriesSizeCap) {

        this.mSamplingInterval = samplingInterval;
@@ -60,6 +61,10 @@ public class LooperStats implements Looper.Observer { 
        mDeviceState = deviceState;

    }



    public void setAddDebugEntries(boolean addDebugEntries) {

        mAddDebugEntries = addDebugEntries;

    }



    @Override

    public Object messageDispatchStarting() {

        if (deviceStateAllowsCollection() && shouldCollectDetailedData()) {
@@ -142,9 +147,22 @@ public class LooperStats implements Looper.Observer { 
        // Add the overflow and collision entries only if they have any data.

        maybeAddSpecialEntry(exportedEntries, mOverflowEntry);

        maybeAddSpecialEntry(exportedEntries, mHashCollisionEntry);

        // Debug entries added to help validate the data.

        if (mAddDebugEntries) {

            exportedEntries.add(createDebugEntry("start_time_millis", mStartTime));

            exportedEntries.add(createDebugEntry("end_time_millis", System.currentTimeMillis()));

        }

        return exportedEntries;

    }



    private ExportedEntry createDebugEntry(String variableName, long value) {

        final Entry entry = new Entry("__DEBUG_" + variableName);

        entry.messageCount = 1;

        entry.recordedMessageCount = 1;

        entry.maxDelayMillis = value;

        return new ExportedEntry(entry);

    }



    /** Returns a timestamp indicating when the statistics were last reset. */

    public long getStartTimeMillis() {

        return mStartTime;

core/tests/coretests/src/com/android/internal/os/LooperStatsTest.java

+23 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ public final class LooperStatsTest { 
        assertThat(entry.recordedDelayMessageCount).isEqualTo(1);

        assertThat(entry.delayMillis).isEqualTo(30);

        assertThat(entry.maxDelayMillis).isEqualTo(30);



    }



    @Test
@@ -429,6 +428,28 @@ public final class LooperStatsTest { 
        assertThat(entries).hasSize(0);

    }



    @Test

    public void testAddsDebugEntries() {

        TestableLooperStats looperStats = new TestableLooperStats(1, 100);

        looperStats.setAddDebugEntries(true);



        Message message = mHandlerFirst.obtainMessage(1000);

        message.when = looperStats.getSystemUptimeMillis();

        Object token = looperStats.messageDispatchStarting();

        looperStats.messageDispatched(token, message);



        List<LooperStats.ExportedEntry> entries = looperStats.getEntries();

        assertThat(entries).hasSize(3);

        LooperStats.ExportedEntry debugEntry1 = entries.get(1);

        assertThat(debugEntry1.handlerClassName).isEqualTo("");

        assertThat(debugEntry1.messageName).isEqualTo("__DEBUG_start_time_millis");

        assertThat(debugEntry1.maxDelayMillis).isEqualTo(looperStats.getStartTimeMillis());

        LooperStats.ExportedEntry debugEntry2 = entries.get(2);

        assertThat(debugEntry2.handlerClassName).isEqualTo("");

        assertThat(debugEntry2.messageName).isEqualTo("__DEBUG_end_time_millis");

        assertThat(debugEntry2.maxDelayMillis).isAtLeast(looperStats.getStartTimeMillis());

    }



    private static void assertThrows(Class<? extends Exception> exceptionClass, Runnable r) {

        try {

            r.run();
@@ -450,6 +471,7 @@ public final class LooperStatsTest { 
            super(samplingInterval, sizeCap);

            this.mSamplingInterval = samplingInterval;

            this.setDeviceState(mDeviceState.getReadonlyClient());

            this.setAddDebugEntries(false);

        }



        void tickRealtime(long micros) {

services/core/java/com/android/server/LooperStatsService.java

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ public class LooperStatsService extends Binder { 
        if (mEnabled != enabled) {

            mEnabled = enabled;

            mStats.reset();

            mStats.setAddDebugEntries(enabled);

            Looper.setObserver(enabled ? mStats : null);

        }

    }