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

Commit 4d86cafd authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Perfetto protolog implementation 

Bug: 276432490
Test: atest com.android.internal.protolog
Change-Id: Ib961bf375cc4aaa4fb1d7d31b35d06b31aacd5d4
parent 0ce7d7ce

core/java/android/tracing/perfetto/DataSource.java

+4 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package android.tracing.perfetto; 


import android.util.proto.ProtoInputStream;



import com.android.internal.annotations.VisibleForTesting;



/**

 * Templated base class meant to be derived by embedders to create a custom data

 * source.
@@ -87,7 +89,8 @@ public abstract class DataSource<DataSourceInstanceType extends DataSourceInstan 
     *

     * NOTE: Should only be called from native side.

     */

    protected TlsStateType createTlsState(CreateTlsStateArgs<DataSourceInstanceType> args) {

    @VisibleForTesting

    public TlsStateType createTlsState(CreateTlsStateArgs<DataSourceInstanceType> args) {

        return null;

    }

core/java/android/tracing/perfetto/DataSourceInstance.java

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.tracing.perfetto;



import com.android.internal.annotations.VisibleForTesting;



/**

 * @hide

 */
@@ -66,7 +68,8 @@ public abstract class DataSourceInstance implements AutoCloseable { 
     * Only required to be called when instance was retrieved with

     * `DataSource#getDataSourceInstanceLocked`.

     */

    public final void release() {

    @VisibleForTesting

    public void release() {

        mDataSource.releaseDataSourceInstance(mInstanceIndex);

    }

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

0 → 100644
+559 −0

File added.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+294 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.internal.protolog;



import static com.android.internal.protolog.common.ProtoLogToolInjected.Value.LEGACY_OUTPUT_FILE_PATH;

import static com.android.internal.protolog.common.ProtoLogToolInjected.Value.VIEWER_CONFIG_PATH;

import static com.android.internal.protolog.common.ProtoLogToolInjected.Value.LEGACY_VIEWER_CONFIG_PATH;

import static com.android.internal.protolog.common.ProtoLogToolInjected.Value.VIEWER_CONFIG_PATH;



import android.annotation.Nullable;
@@ -100,7 +100,7 @@ public class ProtoLogImpl { 
        if (sServiceInstance == null) {

            if (android.tracing.Flags.perfettoProtolog()) {

                sServiceInstance =

                        new PerfettoProtoLogImpl(sViewerConfigPath, sLegacyViewerConfigPath);

                        new PerfettoProtoLogImpl(sViewerConfigPath);

            } else {

                sServiceInstance =

                        new LegacyProtoLogImpl(sLegacyOutputFilePath, sLegacyViewerConfigPath);