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

Commit 31c08d92 authored by Adithya Srinivasan's avatar Adithya Srinivasan
Browse files

Remove FrameTracer from BLAST code 

Since we are not focussing on BLAST for frame lifecycle, having to
support BLAST's frame lifecycle without proper understanding of the use
cases is going to be hard. This change removes the frame lifecycle code
from BLAST.

Bug: 158493222
Test: atest FrameTracerTest
Change-Id: Icb909fc836d5be214dade4991f582c76e5b2398d
parent 607a0c6d

services/surfaceflinger/BufferStateLayer.cpp

+0 −14
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <renderengine/Image.h>

#include <renderengine/Image.h>





#include "EffectLayer.h"

#include "EffectLayer.h"

#include "FrameTracer/FrameTracer.h"

#include "TimeStats/TimeStats.h"

#include "TimeStats/TimeStats.h"





namespace android {

namespace android {
@@ -98,9 +97,6 @@ void BufferStateLayer::onLayerDisplayed(const sp<Fence>& releaseFence) { 




    // Prevent tracing the same release multiple times.

    // Prevent tracing the same release multiple times.

    if (mPreviousFrameNumber != mPreviousReleasedFrameNumber) {

    if (mPreviousFrameNumber != mPreviousReleasedFrameNumber) {

        mFlinger->mFrameTracer->traceFence(getSequence(), mPreviousBufferId, mPreviousFrameNumber,

                                           std::make_shared<FenceTime>(releaseFence),

                                           FrameTracer::FrameEvent::RELEASE_FENCE);

        mPreviousReleasedFrameNumber = mPreviousFrameNumber;

        mPreviousReleasedFrameNumber = mPreviousFrameNumber;

    }

    }

}

}
@@ -277,9 +273,6 @@ bool BufferStateLayer::setBuffer(const sp<GraphicBuffer>& buffer, const sp<Fence 
    const int32_t layerId = getSequence();

    const int32_t layerId = getSequence();

    mFlinger->mTimeStats->setPostTime(layerId, mCurrentState.frameNumber, getName().c_str(),

    mFlinger->mTimeStats->setPostTime(layerId, mCurrentState.frameNumber, getName().c_str(),

                                      postTime);

                                      postTime);

    mFlinger->mFrameTracer->traceNewLayer(layerId, getName().c_str());

    mFlinger->mFrameTracer->traceTimestamp(layerId, buffer->getId(), mCurrentState.frameNumber,

                                           postTime, FrameTracer::FrameEvent::POST);

    desiredPresentTime = desiredPresentTime <= 0 ? 0 : desiredPresentTime;

    desiredPresentTime = desiredPresentTime <= 0 ? 0 : desiredPresentTime;

    mCurrentState.desiredPresentTime = desiredPresentTime;

    mCurrentState.desiredPresentTime = desiredPresentTime;
@@ -580,20 +573,13 @@ status_t BufferStateLayer::updateTexImage(bool& /*recomputeVisibleRegions*/, nse 
        status_t err = bindTextureImage();

        status_t err = bindTextureImage();

        if (err != NO_ERROR) {

        if (err != NO_ERROR) {

            mFlinger->mTimeStats->onDestroy(layerId);

            mFlinger->mTimeStats->onDestroy(layerId);

            mFlinger->mFrameTracer->onDestroy(layerId);

            return BAD_VALUE;

            return BAD_VALUE;

        }

        }

    }

    }





    const uint64_t bufferID = getCurrentBufferId();

    mFlinger->mTimeStats->setAcquireFence(layerId, mDrawingState.frameNumber,

    mFlinger->mTimeStats->setAcquireFence(layerId, mDrawingState.frameNumber,

                                          mBufferInfo.mFenceTime);

                                          mBufferInfo.mFenceTime);

    mFlinger->mFrameTracer->traceFence(layerId, bufferID, mDrawingState.frameNumber,

                                       mBufferInfo.mFenceTime,

                                       FrameTracer::FrameEvent::ACQUIRE_FENCE);

    mFlinger->mTimeStats->setLatchTime(layerId, mDrawingState.frameNumber, latchTime);

    mFlinger->mTimeStats->setLatchTime(layerId, mDrawingState.frameNumber, latchTime);

    mFlinger->mFrameTracer->traceTimestamp(layerId, bufferID, mDrawingState.frameNumber, latchTime,

                                           FrameTracer::FrameEvent::LATCH);





    mCurrentStateModified = false;

    mCurrentStateModified = false;