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

Commit 0f54dd8c authored by Charles Yo's avatar Charles Yo Committed by Android Build Coastguard Worker
Browse files

Revert "Ensure we wait for all messages to be traced before term..." 

Revert submission 28147757-no-processing-protolog

Reason for revert: b/351458758

Reverted changes: /q/submissionid:28147757-no-processing-protolog
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7c82d9edaca9e6834801c2d145186a80daadac1a)
Merged-In: Ic284e970b914eed33b99a3e8fcce00f4da010d3b
Change-Id: Ic284e970b914eed33b99a3e8fcce00f4da010d3b
parent abea3af3

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

+2 −30
Original line number Diff line number Diff line
@@ -82,10 +82,7 @@ import java.util.TreeMap; 
import java.util.UUID;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executors;

import java.util.concurrent.TimeUnit;

import java.util.concurrent.atomic.AtomicInteger;

import java.util.concurrent.locks.Lock;

import java.util.concurrent.locks.ReentrantLock;



/**

 * A service for the ProtoLog logging system.
@@ -96,7 +93,7 @@ public class PerfettoProtoLogImpl implements IProtoLog { 


    private final ProtoLogDataSource mDataSource = new ProtoLogDataSource(

            this::onTracingInstanceStart,

            this::onTracingFlush,

            this::dumpTransitionTraceConfig,

            this::onTracingInstanceStop

    );

    private final ProtoLogViewerConfigReader mViewerConfigReader;
@@ -107,8 +104,7 @@ public class PerfettoProtoLogImpl implements IProtoLog { 
    private final int[] mDefaultLogLevelCounts = new int[LogLevel.values().length];

    private final Map<IProtoLogGroup, int[]> mLogLevelCounts = new ArrayMap<>();



    private final Lock mBackgroundServiceLock = new ReentrantLock();

    private ExecutorService mBackgroundLoggingService = Executors.newSingleThreadExecutor();

    private final ExecutorService mBackgroundLoggingService = Executors.newSingleThreadExecutor();



    public PerfettoProtoLogImpl(String viewerConfigFilePath, Runnable cacheUpdater) {

        this(() -> {
@@ -183,30 +179,6 @@ public class PerfettoProtoLogImpl implements IProtoLog { 
        }

    }



    private void onTracingFlush() {

        final ExecutorService loggingService;

        try {

            mBackgroundServiceLock.lock();

            loggingService = mBackgroundLoggingService;

            mBackgroundLoggingService = Executors.newSingleThreadExecutor();

        } finally {

            mBackgroundServiceLock.unlock();

        }



        try {

            loggingService.shutdown();

            boolean finished = loggingService.awaitTermination(10, TimeUnit.SECONDS);



            if (!finished) {

                Log.e(LOG_TAG, "ProtoLog background tracing service didn't finish gracefully.");

            }

        } catch (InterruptedException e) {

            Log.e(LOG_TAG, "Failed to wait for tracing to finish", e);

        }



        dumpTransitionTraceConfig();

    }



    private void dumpTransitionTraceConfig() {

        if (mViewerConfigInputStreamProvider == null) {

            // No viewer config available