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

Commit 6c03d3ba authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Add more logging to PerfettoProtoLogImpl 

This will help us debug issues with PerfettoProtoLogImpl.

Flag: EXEMPT adding logging
Bug: 357588277
Change-Id: I75ffeb183f62b017103afc4c7f28774ef3b2059d
parent e1ab7920

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

+16 −2
Original line number Diff line number Diff line
@@ -332,6 +332,8 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto 
    }



    private void onTracingFlush() {

        Log.d(LOG_TAG, "Executing onTracingFlush");



        final ExecutorService loggingService;

        try {

            mBackgroundServiceLock.lock();
@@ -352,15 +354,19 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto 
            Log.e(LOG_TAG, "Failed to wait for tracing to finish", e);

        }



        dumpTransitionTraceConfig();

        dumpViewerConfig();



        Log.d(LOG_TAG, "Finished onTracingFlush");

    }



    private void dumpTransitionTraceConfig() {

    private void dumpViewerConfig() {

        if (mViewerConfigInputStreamProvider == null) {

            // No viewer config available

            return;

        }



        Log.d(LOG_TAG, "Dumping viewer config to trace");



        ProtoInputStream pis = mViewerConfigInputStreamProvider.getInputStream();



        if (pis == null) {
@@ -390,6 +396,8 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto 
                Log.e(LOG_TAG, "Failed to read ProtoLog viewer config to dump on tracing end", e);

            }

        });



        Log.d(LOG_TAG, "Dumped viewer config to trace");

    }



    private static void writeViewerConfigGroup(
@@ -770,6 +778,8 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto 


    private synchronized void onTracingInstanceStart(

            int instanceIdx, ProtoLogDataSource.ProtoLogConfig config) {

        Log.d(LOG_TAG, "Executing onTracingInstanceStart");



        final LogLevel defaultLogFrom = config.getDefaultGroupConfig().logFrom;

        for (int i = defaultLogFrom.ordinal(); i < LogLevel.values().length; i++) {

            mDefaultLogLevelCounts[i]++;
@@ -800,10 +810,13 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto 
        mCacheUpdater.run();



        this.mTracingInstances.incrementAndGet();



        Log.d(LOG_TAG, "Finished onTracingInstanceStart");

    }



    private synchronized void onTracingInstanceStop(

            int instanceIdx, ProtoLogDataSource.ProtoLogConfig config) {

        Log.d(LOG_TAG, "Executing onTracingInstanceStop");

        this.mTracingInstances.decrementAndGet();



        final LogLevel defaultLogFrom = config.getDefaultGroupConfig().logFrom;
@@ -835,6 +848,7 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto 
        }



        mCacheUpdater.run();

        Log.d(LOG_TAG, "Finished onTracingInstanceStop");

    }



    private static void logAndPrintln(@Nullable PrintWriter pw, String msg) {