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

Commit cae548f0 authored by Peter Kalauskas's avatar Peter Kalauskas
Browse files

tracinglib: demo updates 

 - Call Trace.registerWithPerfetto().

 - Remove usages of deprecated nameCoroutine()

 - Use stateInTraced()

Test: atest CoroutineTracingPerfTests
Flag: com.android.systemui.coroutine_tracing
Bug: 350657545
Change-Id: I82024c70868f51926fa5491099c35f472e074c38
parent b6eab990

tracinglib/demo/src/ApplicationComponent.kt

+4 −0
Original line number Diff line number Diff line
@@ -140,6 +140,10 @@ interface ApplicationComponent { 


class MainAppComponentFactory : AppComponentFactory() {



    init {

        Trace.registerWithPerfetto()

    }



    private val appComponent: ApplicationComponent = DaggerApplicationComponent.create()



    override fun instantiateActivityCompat(

tracinglib/demo/src/experiments/BasicTracingTutorial.kt

+0 −39
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.example.tracing.demo.experiments 
import com.android.app.tracing.TraceUtils.traceAsync

import com.android.app.tracing.coroutines.createCoroutineTracingContext

import com.android.app.tracing.coroutines.launchTraced

import com.android.app.tracing.coroutines.nameCoroutine

import com.example.tracing.demo.FixedThread1

import javax.inject.Inject

import javax.inject.Singleton
@@ -265,43 +264,6 @@ constructor(@FixedThread1 private var handlerDispatcher: CoroutineDispatcher) : 
         */

    }



    /** 9: Merging trace contexts */

    private fun step9MergingTraceContexts(job: Job) {

        // Next, we'll look at how the trace context installed on the root coroutine

        // scope is copied and merged for its children:



        // As a prerequisite, we'll create two parent scopes: one with a trace context,

        // and the other without.

        val emptyParent = CoroutineScope(job + handlerDispatcher)

        val traceableParent =

            CoroutineScope(

                job +

                    handlerDispatcher +

                    createCoroutineTracingContext(

                        name = "ParentScope",

                        walkStackForDefaultNames = true,

                        countContinuations = true,

                    )

            )



        // We'll also create two children: one with a trace context, the other with

        // a "name" context. The name context is like a lighter weight version of

        // the trace context. It's only use is in copying a name into the trace

        // context, if it exists.

        val otherTraceContext = createCoroutineTracingContext(name = "other-context")

        val nameContext = nameCoroutine("name-context")



        traceableParent.launch(otherTraceContext) { forceSuspend("A1", 1) }

        traceableParent.launch(nameContext) { forceSuspend("A2", 1) }



        emptyParent.launch(otherTraceContext) { forceSuspend("B1", 1) }

        emptyParent.launch(nameContext) { forceSuspend("A2", 1) }



        /*

        Expected trace output (image alt text):

         */

    }



    override suspend fun runExperiment() {

        runStep(1, ::step1UntracedCoroutineOnDefaultDispatcher)

        runStep(2, ::step2UntracedCoroutineOnTracedLooperThread)
@@ -311,6 +273,5 @@ constructor(@FixedThread1 private var handlerDispatcher: CoroutineDispatcher) : 
        runStep(6, ::step6UseLaunchedTraced)

        runStep(7, ::step7ExplicitLaunchName)

        runStep(8, ::step8CountContinuations)

        runStep(9, ::step9MergingTraceContexts)

    }

}

tracinglib/demo/src/experiments/SharedFlowUsage.kt

+2 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import com.android.app.tracing.coroutines.flow.collectTraced 
import com.android.app.tracing.coroutines.flow.filterTraced as filter

import com.android.app.tracing.coroutines.flow.flowName

import com.android.app.tracing.coroutines.flow.mapTraced as map

import com.android.app.tracing.coroutines.flow.stateInTraced

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.app.tracing.coroutines.traceCoroutine

import com.example.tracing.demo.FixedThread1
@@ -33,7 +34,6 @@ import kotlinx.coroutines.coroutineScope 
import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.flow

import kotlinx.coroutines.flow.flowOn

import kotlinx.coroutines.flow.stateIn



@Singleton

class SharedFlowUsage
@@ -70,7 +70,7 @@ constructor( 
            .flowName("COLD_FLOW")



    override suspend fun runExperiment(): Unit = coroutineScope {

        val stateFlow = coldFlow.stateIn(this, SharingStarted.Eagerly, 10)

        val stateFlow = coldFlow.stateInTraced("My-StateFlow", this, SharingStarted.Eagerly, 10)

        launch("launchAAAA", dispatcher1) {

            stateFlow.collect("collectAAAA") {

                traceCoroutine("AAAA collected: $it") { forceSuspend("AAAA", 15) }