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

Commit 35c9d2f0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check if the trace was stopped before starting the tracing thread" into... 

Merge "Check if the trace was stopped before starting the tracing thread" into rvc-dev am: 164a1d8b

Change-Id: I0354d4f771831daabb3d09d72dc0617c3584e6a7
parents 2b8f92d5 164a1d8b

services/surfaceflinger/SurfaceTracing.cpp

+3 −4
Original line number Diff line number Diff line
@@ -36,22 +36,21 @@ SurfaceTracing::SurfaceTracing(SurfaceFlinger& flinger) 
      : mFlinger(flinger), mSfLock(flinger.mDrawingStateLock) {}



void SurfaceTracing::mainLoop() {

    addFirstEntry();

    bool enabled = true;

    bool enabled = addFirstEntry();

    while (enabled) {

        LayersTraceProto entry = traceWhenNotified();

        enabled = addTraceToBuffer(entry);

    }

}



void SurfaceTracing::addFirstEntry() {

bool SurfaceTracing::addFirstEntry() {

    const auto displayDevice = mFlinger.getDefaultDisplayDevice();

    LayersTraceProto entry;

    {

        std::scoped_lock lock(mSfLock);

        entry = traceLayersLocked("tracing.enable", displayDevice);

    }

    addTraceToBuffer(entry);

    return addTraceToBuffer(entry);

}



LayersTraceProto SurfaceTracing::traceWhenNotified() {

services/surfaceflinger/SurfaceTracing.h

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ private: 
    };



    void mainLoop();

    void addFirstEntry();

    bool addFirstEntry();

    LayersTraceProto traceWhenNotified();

    LayersTraceProto traceLayersLocked(const char* where,

                                       const sp<const DisplayDevice>& displayDevice)