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

Commit ca865e7f authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Reduce Scenario object usage in flicker. 

It is only necessary for caching purposes (for now), and shouldn't be spread throughout the codebase

Bug: 415983232
Flag: EXEMPT Test only
Test: atest TracingTests
Change-Id: I391dbe10aa6e377d2d798cb96f0eadf1770d0533
parent 1247309c

apct-tests/perftests/tracing/src/android/tracing/perfetto/DataSourcePerfTest.kt

+1 −2
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import android.os.Trace 
import android.perftests.utils.BenchmarkState

import android.perftests.utils.BenchmarkState

import android.perftests.utils.PerfStatusReporter

import android.perftests.utils.PerfStatusReporter

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Postsubmit

import android.tools.ScenarioBuilder

import android.tools.traces.busyWaitForDataSourceRegistration

import android.tools.traces.busyWaitForDataSourceRegistration

import android.tools.traces.busyWaitTracingSessionDoesntExist

import android.tools.traces.busyWaitTracingSessionDoesntExist

import android.tools.traces.busyWaitTracingSessionExists

import android.tools.traces.busyWaitTracingSessionExists
@@ -483,7 +482,7 @@ class DataSourcePerfTest { 
    // Helper to create a dummy ResultWriter

    // Helper to create a dummy ResultWriter

    private fun createDummyWriter(scenarioDir: File): ResultWriter {

    private fun createDummyWriter(scenarioDir: File): ResultWriter {

        return ResultWriter()

        return ResultWriter()

            .forScenario(ScenarioBuilder().forClass("DataSourcePerfTest").build())

            .withName("DataSourcePerfTest")

            .withOutputDir(scenarioDir)

            .withOutputDir(scenarioDir)

            .setRunComplete()

            .setRunComplete()

    }

    }

apct-tests/perftests/tracing/src/com/android/internal/protolog/ProtoLogPerfTest.kt

+1 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.internal.protolog 
import android.os.ServiceManager

import android.os.ServiceManager

import android.perftests.utils.PerfStatusReporter

import android.perftests.utils.PerfStatusReporter

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Postsubmit

import android.tools.ScenarioBuilder

import android.tools.traces.busyWaitForDataSourceRegistration

import android.tools.traces.busyWaitForDataSourceRegistration

import android.tools.traces.busyWaitTracingSessionDoesntExist

import android.tools.traces.busyWaitTracingSessionDoesntExist

import android.tools.traces.busyWaitTracingSessionExists

import android.tools.traces.busyWaitTracingSessionExists
@@ -192,7 +191,7 @@ class ProtoLogPerfTest(logType: LogType) { 
    // Helper to create a dummy ResultWriter

    // Helper to create a dummy ResultWriter

    private fun createDummyWriter(scenarioDir: File): ResultWriter {

    private fun createDummyWriter(scenarioDir: File): ResultWriter {

        return ResultWriter()

        return ResultWriter()

            .forScenario(ScenarioBuilder().forClass("DataSourcePerfTest").build())

            .withName("DataSourcePerfTest")

            .withOutputDir(scenarioDir)

            .withOutputDir(scenarioDir)

            .setRunComplete()

            .setRunComplete()

    }

    }

apct-tests/perftests/tracing/src/com/android/server/wm/WmShellTransitionPerfTest.kt

+1 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.wm 
import android.os.IBinder

import android.os.IBinder

import android.perftests.utils.PerfStatusReporter

import android.perftests.utils.PerfStatusReporter

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Postsubmit

import android.tools.ScenarioBuilder

import android.tools.traces.busyWaitTracingSessionDoesntExist

import android.tools.traces.busyWaitTracingSessionDoesntExist

import android.tools.traces.busyWaitTracingSessionExists

import android.tools.traces.busyWaitTracingSessionExists

import android.tools.traces.io.ResultWriter

import android.tools.traces.io.ResultWriter
@@ -90,7 +89,7 @@ class WmShellTransitionPerfTest(private val mTracingState: TracingState?) { 
    // Helper to create a dummy ResultWriter

    // Helper to create a dummy ResultWriter

    private fun createDummyWriter(scenarioDir: File): ResultWriter {

    private fun createDummyWriter(scenarioDir: File): ResultWriter {

        return ResultWriter()

        return ResultWriter()

            .forScenario(ScenarioBuilder().forClass("DataSourcePerfTest").build())

            .withName("DataSourcePerfTest")

            .withOutputDir(scenarioDir)

            .withOutputDir(scenarioDir)

            .setRunComplete()

            .setRunComplete()

    }

    }

services/tests/wmtests/src/com/android/server/wm/WindowTracingPerfettoTest.java

+1 −3
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ import static java.io.File.createTempFile; 
import static java.nio.file.Files.createTempDirectory;

import static java.nio.file.Files.createTempDirectory;





import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.Presubmit;

import android.tools.ScenarioBuilder;

import android.tools.traces.io.ResultWriter;

import android.tools.traces.io.ResultWriter;

import android.tools.traces.monitors.PerfettoTraceMonitor;

import android.tools.traces.monitors.PerfettoTraceMonitor;

import android.util.Log;

import android.util.Log;
@@ -206,8 +205,7 @@ public class WindowTracingPerfettoTest { 
        }

        }





        ResultWriter writer = new ResultWriter()

        ResultWriter writer = new ResultWriter()

                .forScenario(new ScenarioBuilder()

                .withName(createTempFile("temp", "").getName())

                        .forClass(createTempFile("temp", "").getName()).build())

                .withOutputDir(createTempDirectory("temp").toFile())

                .withOutputDir(createTempDirectory("temp").toFile())

                .setRunComplete();

                .setRunComplete();

tests/Tracing/src/android/tracing/perfetto/DataSourceTest.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -20,8 +20,8 @@ import static android.internal.perfetto.protos.TestEventOuterClass.TestEvent.PAY 
import static android.internal.perfetto.protos.TestEventOuterClass.TestEvent.TestPayload.SINGLE_INT;

import static android.internal.perfetto.protos.TestEventOuterClass.TestEvent.TestPayload.SINGLE_INT;

import static android.internal.perfetto.protos.TracePacketOuterClass.TracePacket.FOR_TESTING;

import static android.internal.perfetto.protos.TracePacketOuterClass.TracePacket.FOR_TESTING;

import static android.tools.traces.Utils.busyWaitForDataSourceRegistration;

import static android.tools.traces.Utils.busyWaitForDataSourceRegistration;

import static android.tools.traces.Utils.busyWaitTracingSessionExists;

import static android.tools.traces.Utils.busyWaitTracingSessionDoesntExist;

import static android.tools.traces.Utils.busyWaitTracingSessionDoesntExist;

import static android.tools.traces.Utils.busyWaitTracingSessionExists;

import static android.tracing.perfetto.TestUtils.createTempWriter;

import static android.tracing.perfetto.TestUtils.createTempWriter;





import static java.io.File.createTempFile;

import static java.io.File.createTempFile;
@@ -29,7 +29,6 @@ import static java.nio.file.Files.createTempDirectory; 




import android.internal.perfetto.protos.DataSourceConfigOuterClass.DataSourceConfig;

import android.internal.perfetto.protos.DataSourceConfigOuterClass.DataSourceConfig;

import android.internal.perfetto.protos.TestConfigOuterClass.TestConfig;

import android.internal.perfetto.protos.TestConfigOuterClass.TestConfig;

import android.tools.ScenarioBuilder;

import android.tools.Tag;

import android.tools.Tag;

import android.tools.io.TraceType;

import android.tools.io.TraceType;

import android.tools.traces.TraceConfig;

import android.tools.traces.TraceConfig;
@@ -370,8 +369,7 @@ public class DataSourceTest { 




        for (int i = 0; i < instanceCount; i++) {

        for (int i = 0; i < instanceCount; i++) {

            final ResultWriter writer = new ResultWriter()

            final ResultWriter writer = new ResultWriter()

                    .forScenario(new ScenarioBuilder()

                    .withName(createTempFile("temp", "").getName())

                            .forClass(createTempFile("temp", "").getName()).build())

                    .withOutputDir(mTracingDirectory)

                    .withOutputDir(mTracingDirectory)

                    .setRunComplete();

                    .setRunComplete();

            writers.add(writer);

            writers.add(writer);