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

Commit 672d2128 authored by Kean Mariotti's avatar Kean Mariotti
Browse files

Adapt imports to new perfetto_trace_javastream structure 

The source protos of the perfetto_trace_javastream target changed,
which results in slightly different classes to be imported.

Bug: 276433199
Test: presubmit
Change-Id: Ieb8022e76c6f9a8ae6081c96834e90b8f36f348c
parent 6a2ba93d

core/java/com/android/internal/protolog/PerfettoProtoLogImpl.java

+26 −26
Original line number Diff line number Diff line
@@ -16,34 +16,34 @@ 


package com.android.internal.protolog;



import static android.internal.perfetto.protos.PerfettoTrace.InternedData.PROTOLOG_STACKTRACE;

import static android.internal.perfetto.protos.PerfettoTrace.InternedData.PROTOLOG_STRING_ARGS;

import static android.internal.perfetto.protos.PerfettoTrace.InternedString.IID;

import static android.internal.perfetto.protos.PerfettoTrace.InternedString.STR;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogMessage.BOOLEAN_PARAMS;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogMessage.DOUBLE_PARAMS;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogMessage.MESSAGE_ID;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogMessage.SINT64_PARAMS;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogMessage.STACKTRACE_IID;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogMessage.STR_PARAM_IIDS;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogViewerConfig.GROUPS;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogViewerConfig.Group.ID;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogViewerConfig.Group.NAME;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogViewerConfig.Group.TAG;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogViewerConfig.MESSAGES;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogViewerConfig.MessageData.GROUP_ID;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogViewerConfig.MessageData.LEVEL;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogViewerConfig.MessageData.MESSAGE;

import static android.internal.perfetto.protos.PerfettoTrace.TracePacket.INTERNED_DATA;

import static android.internal.perfetto.protos.PerfettoTrace.TracePacket.PROTOLOG_MESSAGE;

import static android.internal.perfetto.protos.PerfettoTrace.TracePacket.PROTOLOG_VIEWER_CONFIG;

import static android.internal.perfetto.protos.PerfettoTrace.TracePacket.SEQUENCE_FLAGS;

import static android.internal.perfetto.protos.PerfettoTrace.TracePacket.SEQ_INCREMENTAL_STATE_CLEARED;

import static android.internal.perfetto.protos.PerfettoTrace.TracePacket.SEQ_NEEDS_INCREMENTAL_STATE;

import static android.internal.perfetto.protos.PerfettoTrace.TracePacket.TIMESTAMP;

import static android.internal.perfetto.protos.InternedDataOuterClass.InternedData.PROTOLOG_STACKTRACE;

import static android.internal.perfetto.protos.InternedDataOuterClass.InternedData.PROTOLOG_STRING_ARGS;

import static android.internal.perfetto.protos.ProfileCommon.InternedString.IID;

import static android.internal.perfetto.protos.ProfileCommon.InternedString.STR;

import static android.internal.perfetto.protos.Protolog.ProtoLogMessage.BOOLEAN_PARAMS;

import static android.internal.perfetto.protos.Protolog.ProtoLogMessage.DOUBLE_PARAMS;

import static android.internal.perfetto.protos.Protolog.ProtoLogMessage.MESSAGE_ID;

import static android.internal.perfetto.protos.Protolog.ProtoLogMessage.SINT64_PARAMS;

import static android.internal.perfetto.protos.Protolog.ProtoLogMessage.STACKTRACE_IID;

import static android.internal.perfetto.protos.Protolog.ProtoLogMessage.STR_PARAM_IIDS;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.GROUPS;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.Group.ID;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.Group.NAME;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.Group.TAG;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.MESSAGES;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.MessageData.GROUP_ID;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.MessageData.LEVEL;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.MessageData.MESSAGE;

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

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

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

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

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

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

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



import android.annotation.Nullable;

import android.internal.perfetto.protos.PerfettoTrace.ProtoLogViewerConfig.MessageData;

import android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.MessageData;

import android.os.ShellCommand;

import android.os.SystemClock;

import android.os.Trace;

core/java/com/android/internal/protolog/ProtoLogDataSource.java

+20 −18
Original line number Diff line number Diff line
@@ -16,14 +16,16 @@ 


package com.android.internal.protolog;



import static android.internal.perfetto.protos.PerfettoTrace.DataSourceConfig.PROTOLOG_CONFIG;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogConfig.GROUP_OVERRIDES;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogConfig.TRACING_MODE;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogGroup.COLLECT_STACKTRACE;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogGroup.GROUP_NAME;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogGroup.LOG_FROM;



import android.internal.perfetto.protos.PerfettoTrace;

import static android.internal.perfetto.protos.ProtologConfig.ProtoLogConfig.DEFAULT;

import static android.internal.perfetto.protos.ProtologConfig.ProtoLogConfig.ENABLE_ALL;

import static android.internal.perfetto.protos.ProtologConfig.ProtoLogConfig.GROUP_OVERRIDES;

import static android.internal.perfetto.protos.ProtologConfig.ProtoLogConfig.TRACING_MODE;

import static android.internal.perfetto.protos.ProtologConfig.ProtoLogGroup.COLLECT_STACKTRACE;

import static android.internal.perfetto.protos.ProtologConfig.ProtoLogGroup.GROUP_NAME;

import static android.internal.perfetto.protos.ProtologConfig.ProtoLogGroup.LOG_FROM;



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

import android.internal.perfetto.protos.ProtologCommon;

import android.tracing.perfetto.CreateIncrementalStateArgs;

import android.tracing.perfetto.CreateTlsStateArgs;

import android.tracing.perfetto.DataSource;
@@ -65,7 +67,7 @@ public class ProtoLogDataSource extends DataSource<ProtoLogDataSource.Instance, 
        try {

            while (configStream.nextField() != ProtoInputStream.NO_MORE_FIELDS) {

                try {

                    if (configStream.getFieldNumber() == (int) PROTOLOG_CONFIG) {

                    if (configStream.getFieldNumber() == (int) DataSourceConfig.PROTOLOG_CONFIG) {

                        if (config != null) {

                            throw new RuntimeException("ProtoLog config already set in loop");

                        }
@@ -179,7 +181,7 @@ public class ProtoLogDataSource extends DataSource<ProtoLogDataSource.Instance, 


    private ProtoLogConfig readProtoLogConfig(ProtoInputStream configStream)

            throws IOException {

        final long config_token = configStream.start(PROTOLOG_CONFIG);

        final long config_token = configStream.start(DataSourceConfig.PROTOLOG_CONFIG);



        LogLevel defaultLogFromLevel = LogLevel.WTF;

        final Map<String, GroupConfig> groupConfigs = new HashMap<>();
@@ -188,9 +190,9 @@ public class ProtoLogDataSource extends DataSource<ProtoLogDataSource.Instance, 
            if (configStream.getFieldNumber() == (int) TRACING_MODE) {

                int tracingMode = configStream.readInt(TRACING_MODE);

                switch (tracingMode) {

                    case PerfettoTrace.ProtoLogConfig.DEFAULT:

                    case DEFAULT:

                        break;

                    case PerfettoTrace.ProtoLogConfig.ENABLE_ALL:

                    case ENABLE_ALL:

                        defaultLogFromLevel = LogLevel.DEBUG;

                        break;

                    default:
@@ -210,27 +212,27 @@ public class ProtoLogDataSource extends DataSource<ProtoLogDataSource.Instance, 
                    if (configStream.getFieldNumber() == (int) LOG_FROM) {

                        final int logFromInt = configStream.readInt(LOG_FROM);

                        switch (logFromInt) {

                            case (PerfettoTrace.PROTOLOG_LEVEL_DEBUG): {

                            case (ProtologCommon.PROTOLOG_LEVEL_DEBUG): {

                                logFromLevel = LogLevel.DEBUG;

                                break;

                            }

                            case (PerfettoTrace.PROTOLOG_LEVEL_VERBOSE): {

                            case (ProtologCommon.PROTOLOG_LEVEL_VERBOSE): {

                                logFromLevel = LogLevel.VERBOSE;

                                break;

                            }

                            case (PerfettoTrace.PROTOLOG_LEVEL_INFO): {

                            case (ProtologCommon.PROTOLOG_LEVEL_INFO): {

                                logFromLevel = LogLevel.INFO;

                                break;

                            }

                            case (PerfettoTrace.PROTOLOG_LEVEL_WARN): {

                            case (ProtologCommon.PROTOLOG_LEVEL_WARN): {

                                logFromLevel = LogLevel.WARN;

                                break;

                            }

                            case (PerfettoTrace.PROTOLOG_LEVEL_ERROR): {

                            case (ProtologCommon.PROTOLOG_LEVEL_ERROR): {

                                logFromLevel = LogLevel.ERROR;

                                break;

                            }

                            case (PerfettoTrace.PROTOLOG_LEVEL_WTF): {

                            case (ProtologCommon.PROTOLOG_LEVEL_WTF): {

                                logFromLevel = LogLevel.WTF;

                                break;

                            }

core/java/com/android/internal/protolog/ProtoLogViewerConfigReader.java

+3 −3
Original line number Diff line number Diff line 
package com.android.internal.protolog;



import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogViewerConfig.MESSAGES;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogViewerConfig.MessageData.MESSAGE;

import static android.internal.perfetto.protos.PerfettoTrace.ProtoLogViewerConfig.MessageData.MESSAGE_ID;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.MESSAGES;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.MessageData.MESSAGE;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.MessageData.MESSAGE_ID;



import android.util.ArrayMap;

import android.util.proto.ProtoInputStream;

core/tests/coretests/src/android/tracing/perfetto/DataSourceTest.java

+14 −13
Original line number Diff line number Diff line
@@ -16,14 +16,15 @@ 


package android.tracing.perfetto;



import static android.internal.perfetto.protos.PerfettoTrace.TestEvent.PAYLOAD;

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

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

import static android.internal.perfetto.protos.TestEventOuterClass.TestEvent.PAYLOAD;

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

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



import static java.io.File.createTempFile;

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



import android.internal.perfetto.protos.PerfettoTrace;

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

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

import android.tools.ScenarioBuilder;

import android.tools.Tag;

import android.tools.io.TraceType;
@@ -46,6 +47,9 @@ import org.junit.BeforeClass; 
import org.junit.Test;

import org.junit.runner.RunWith;



import perfetto.protos.PerfettoConfig;

import perfetto.protos.TracePacketOuterClass;



import java.io.File;

import java.io.IOException;

import java.util.ArrayList;
@@ -56,9 +60,6 @@ import java.util.concurrent.atomic.AtomicBoolean; 
import java.util.concurrent.atomic.AtomicInteger;

import java.util.concurrent.atomic.AtomicReference;



import perfetto.protos.PerfettoConfig;

import perfetto.protos.TracePacketOuterClass;



@RunWith(AndroidJUnit4.class)

public class DataSourceTest {

    private final File mTracingDirectory = createTempDirectory("temp").toFile();
@@ -328,19 +329,19 @@ public class DataSourceTest { 
        int configDummyIntValue = 0;

        while (configStream.get().nextField() != ProtoInputStream.NO_MORE_FIELDS) {

            if (configStream.get().getFieldNumber()

                    == (int) PerfettoTrace.DataSourceConfig.FOR_TESTING) {

                    == (int) DataSourceConfig.FOR_TESTING) {

                final long forTestingToken = configStream.get()

                        .start(PerfettoTrace.DataSourceConfig.FOR_TESTING);

                        .start(DataSourceConfig.FOR_TESTING);

                while (configStream.get().nextField() != ProtoInputStream.NO_MORE_FIELDS) {

                    if (configStream.get().getFieldNumber()

                            == (int) PerfettoTrace.TestConfig.DUMMY_FIELDS) {

                            == (int) TestConfig.DUMMY_FIELDS) {

                        final long dummyFieldsToken = configStream.get()

                                .start(PerfettoTrace.TestConfig.DUMMY_FIELDS);

                                .start(TestConfig.DUMMY_FIELDS);

                        while (configStream.get().nextField() != ProtoInputStream.NO_MORE_FIELDS) {

                            if (configStream.get().getFieldNumber()

                                    == (int) PerfettoTrace.TestConfig.DummyFields.FIELD_INT32) {

                                    == (int) TestConfig.DummyFields.FIELD_INT32) {

                                int val = configStream.get().readInt(

                                        PerfettoTrace.TestConfig.DummyFields.FIELD_INT32);

                                        TestConfig.DummyFields.FIELD_INT32);

                                if (val != 0) {

                                    configDummyIntValue = val;

                                    break;

libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/PerfettoTransitionTracer.java

+23 −20
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 


package com.android.wm.shell.transition.tracing;



import android.internal.perfetto.protos.PerfettoTrace;

import android.internal.perfetto.protos.ShellTransitionOuterClass.ShellHandlerMapping;

import android.internal.perfetto.protos.ShellTransitionOuterClass.ShellHandlerMappings;

import android.internal.perfetto.protos.ShellTransitionOuterClass.ShellTransition;

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

import android.os.SystemClock;

import android.os.Trace;

import android.tracing.perfetto.DataSourceParams;
@@ -72,11 +75,11 @@ public class PerfettoTransitionTracer implements TransitionTracer { 
            final int handlerId = getHandlerId(handler);



            final ProtoOutputStream os = ctx.newTracePacket();

            final long token = os.start(PerfettoTrace.TracePacket.SHELL_TRANSITION);

            os.write(PerfettoTrace.ShellTransition.ID, transitionId);

            os.write(PerfettoTrace.ShellTransition.DISPATCH_TIME_NS,

            final long token = os.start(TracePacket.SHELL_TRANSITION);

            os.write(ShellTransition.ID, transitionId);

            os.write(ShellTransition.DISPATCH_TIME_NS,

                    SystemClock.elapsedRealtimeNanos());

            os.write(PerfettoTrace.ShellTransition.HANDLER, handlerId);

            os.write(ShellTransition.HANDLER, handlerId);

            os.end(token);

        });

    }
@@ -117,11 +120,11 @@ public class PerfettoTransitionTracer implements TransitionTracer { 
    private void doLogMergeRequested(int mergeRequestedTransitionId, int playingTransitionId) {

        mDataSource.trace(ctx -> {

            final ProtoOutputStream os = ctx.newTracePacket();

            final long token = os.start(PerfettoTrace.TracePacket.SHELL_TRANSITION);

            os.write(PerfettoTrace.ShellTransition.ID, mergeRequestedTransitionId);

            os.write(PerfettoTrace.ShellTransition.MERGE_REQUEST_TIME_NS,

            final long token = os.start(TracePacket.SHELL_TRANSITION);

            os.write(ShellTransition.ID, mergeRequestedTransitionId);

            os.write(ShellTransition.MERGE_REQUEST_TIME_NS,

                    SystemClock.elapsedRealtimeNanos());

            os.write(PerfettoTrace.ShellTransition.MERGE_TARGET, playingTransitionId);

            os.write(ShellTransition.MERGE_TARGET, playingTransitionId);

            os.end(token);

        });

    }
@@ -149,11 +152,11 @@ public class PerfettoTransitionTracer implements TransitionTracer { 
    private void doLogMerged(int mergeRequestedTransitionId, int playingTransitionId) {

        mDataSource.trace(ctx -> {

            final ProtoOutputStream os = ctx.newTracePacket();

            final long token = os.start(PerfettoTrace.TracePacket.SHELL_TRANSITION);

            os.write(PerfettoTrace.ShellTransition.ID, mergeRequestedTransitionId);

            os.write(PerfettoTrace.ShellTransition.MERGE_TIME_NS,

            final long token = os.start(TracePacket.SHELL_TRANSITION);

            os.write(ShellTransition.ID, mergeRequestedTransitionId);

            os.write(ShellTransition.MERGE_TIME_NS,

                    SystemClock.elapsedRealtimeNanos());

            os.write(PerfettoTrace.ShellTransition.MERGE_TARGET, playingTransitionId);

            os.write(ShellTransition.MERGE_TARGET, playingTransitionId);

            os.end(token);

        });

    }
@@ -180,9 +183,9 @@ public class PerfettoTransitionTracer implements TransitionTracer { 
    private void doLogAborted(int transitionId) {

        mDataSource.trace(ctx -> {

            final ProtoOutputStream os = ctx.newTracePacket();

            final long token = os.start(PerfettoTrace.TracePacket.SHELL_TRANSITION);

            os.write(PerfettoTrace.ShellTransition.ID, transitionId);

            os.write(PerfettoTrace.ShellTransition.SHELL_ABORT_TIME_NS,

            final long token = os.start(TracePacket.SHELL_TRANSITION);

            os.write(ShellTransition.ID, transitionId);

            os.write(ShellTransition.SHELL_ABORT_TIME_NS,

                    SystemClock.elapsedRealtimeNanos());

            os.end(token);

        });
@@ -196,14 +199,14 @@ public class PerfettoTransitionTracer implements TransitionTracer { 
        mDataSource.trace(ctx -> {

            final ProtoOutputStream os = ctx.newTracePacket();



            final long mappingsToken = os.start(PerfettoTrace.TracePacket.SHELL_HANDLER_MAPPINGS);

            final long mappingsToken = os.start(TracePacket.SHELL_HANDLER_MAPPINGS);

            for (Map.Entry<String, Integer> entry : mHandlerMapping.entrySet()) {

                final String handler = entry.getKey();

                final int handlerId = entry.getValue();



                final long mappingEntryToken = os.start(PerfettoTrace.ShellHandlerMappings.MAPPING);

                os.write(PerfettoTrace.ShellHandlerMapping.ID, handlerId);

                os.write(PerfettoTrace.ShellHandlerMapping.NAME, handler);

                final long mappingEntryToken = os.start(ShellHandlerMappings.MAPPING);

                os.write(ShellHandlerMapping.ID, handlerId);

                os.write(ShellHandlerMapping.NAME, handler);

                os.end(mappingEntryToken);



            }