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

Commit 5d339ddc authored by Olivier Gaillard's avatar Olivier Gaillard
Browse files

Add sampling interval debug entry. 

Test: atest BinderCallsStatsTest LooperStatsTest
Change-Id: I5a5d836b2a4d2160196caedeb5a01cccceaa2258
parent 1c56b4d2

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

+1 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ public class BinderCallsStats implements BinderInternal.Observer { 
            resultCallStats.add(createDebugEntry("end_time_millis", SystemClock.elapsedRealtime()));

            resultCallStats.add(

                    createDebugEntry("battery_time_millis", mBatteryStopwatch.getMillis()));

            resultCallStats.add(createDebugEntry("sampling_interval", mPeriodicSamplingInterval));

        }



        return resultCallStats;

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

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ public class LooperStats implements Looper.Observer { 
            exportedEntries.add(createDebugEntry("end_time_millis", SystemClock.elapsedRealtime()));

            exportedEntries.add(

                    createDebugEntry("battery_time_millis", mBatteryStopwatch.getMillis()));

            exportedEntries.add(createDebugEntry("sampling_interval", mSamplingInterval));

        }

        return exportedEntries;

    }

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

+5 −1
Original line number Diff line number Diff line
@@ -642,8 +642,9 @@ public class BinderCallsStatsTest { 
        long startTime = SystemClock.elapsedRealtime();

        TestBinderCallsStats bcs = new TestBinderCallsStats();

        bcs.setAddDebugEntries(true);

        bcs.setSamplingInterval(10);

        ArrayList<BinderCallsStats.ExportedCallStat> callStats = bcs.getExportedCallStats();

        assertEquals(3, callStats.size());

        assertEquals(4, callStats.size());

        BinderCallsStats.ExportedCallStat debugEntry1 = callStats.get(0);

        assertEquals("", debugEntry1.className);

        assertEquals("__DEBUG_start_time_millis", debugEntry1.methodName);
@@ -656,6 +657,9 @@ public class BinderCallsStatsTest { 
        assertEquals("", debugEntry3.className);

        assertEquals("__DEBUG_battery_time_millis", debugEntry3.methodName);

        assertTrue(debugEntry3.latencyMicros >= 0);

        BinderCallsStats.ExportedCallStat debugEntry4 = callStats.get(3);

        assertEquals("__DEBUG_sampling_interval", debugEntry4.methodName);

        assertEquals(10, debugEntry4.latencyMicros);

    }



    @Test

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

+5 −1
Original line number Diff line number Diff line
@@ -452,6 +452,7 @@ public final class LooperStatsTest { 
    public void testAddsDebugEntries() {

        TestableLooperStats looperStats = new TestableLooperStats(1, 100);

        looperStats.setAddDebugEntries(true);

        looperStats.setSamplingInterval(10);



        Message message = mHandlerFirst.obtainMessage(1000);

        message.when = looperStats.getSystemUptimeMillis();
@@ -459,7 +460,7 @@ public final class LooperStatsTest { 
        looperStats.messageDispatched(token, message);



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

        assertThat(entries).hasSize(4);

        assertThat(entries).hasSize(5);

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

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

        assertThat(debugEntry1.messageName).isEqualTo("__DEBUG_start_time_millis");
@@ -474,6 +475,9 @@ public final class LooperStatsTest { 
        assertThat(debugEntry3.handlerClassName).isEqualTo("");

        assertThat(debugEntry3.messageName).isEqualTo("__DEBUG_battery_time_millis");

        assertThat(debugEntry3.totalLatencyMicros).isAtLeast(0L);

        LooperStats.ExportedEntry debugEntry4 = entries.get(4);

        assertThat(debugEntry4.messageName).isEqualTo("__DEBUG_sampling_interval");

        assertThat(debugEntry4.totalLatencyMicros).isEqualTo(10L);

    }



    @Test