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

Commit 74ca6abe authored by Vishnu Nair's avatar Vishnu Nair
Browse files

BBQ: Check if the buffer is already in the pending release queue before logging 

As a workaround for lost release callbacks, we try to
release buffers in the submitted queue. If the buffer
was released previously but held in the pending release
queue, we would log incorrectly. This fixes the misleading
logs.

Test: presubmit
Test: logcat
Fixes: 255679881
Change-Id: I7e46f21f4c4fa1ee8c70e3ee8cd3f3665fe7442a
(cherry picked from commit 28fe2e69)
parent 69d75577

libs/gui/BLASTBufferQueue.cpp

+15 −7
Original line number Diff line number Diff line
@@ -357,11 +357,12 @@ void BLASTBufferQueue::transactionCallback(nsecs_t /*latchTime*/, const sp<Fence 
                    }

                }

                for (const auto& staleRelease : staleReleases) {

                    BQA_LOGE("Faking releaseBufferCallback from transactionCompleteCallback");

                    BBQ_TRACE("FakeReleaseCallback");

                    releaseBufferCallbackLocked(staleRelease,

                        stat.previousReleaseFence ? stat.previousReleaseFence : Fence::NO_FENCE,

                        stat.currentMaxAcquiredBufferCount);

                                                stat.previousReleaseFence

                                                        ? stat.previousReleaseFence

                                                        : Fence::NO_FENCE,

                                                stat.currentMaxAcquiredBufferCount,

                                                true /* fakeRelease */);

                }

            } else {

                BQA_LOGE("Failed to find matching SurfaceControl in transactionCallback");
@@ -405,11 +406,13 @@ void BLASTBufferQueue::releaseBufferCallback( 
    BBQ_TRACE();



    std::unique_lock _lock{mMutex};

    releaseBufferCallbackLocked(id, releaseFence, currentMaxAcquiredBufferCount);

    releaseBufferCallbackLocked(id, releaseFence, currentMaxAcquiredBufferCount,

                                false /* fakeRelease */);

}



void BLASTBufferQueue::releaseBufferCallbackLocked(const ReleaseCallbackId& id,

        const sp<Fence>& releaseFence, std::optional<uint32_t> currentMaxAcquiredBufferCount) {

void BLASTBufferQueue::releaseBufferCallbackLocked(

        const ReleaseCallbackId& id, const sp<Fence>& releaseFence,

        std::optional<uint32_t> currentMaxAcquiredBufferCount, bool fakeRelease) {

    ATRACE_CALL();

    BQA_LOGV("releaseBufferCallback %s", id.to_string().c_str());
@@ -432,6 +435,11 @@ void BLASTBufferQueue::releaseBufferCallbackLocked(const ReleaseCallbackId& id, 
    auto rb = ReleasedBuffer{id, releaseFence};

    if (std::find(mPendingRelease.begin(), mPendingRelease.end(), rb) == mPendingRelease.end()) {

        mPendingRelease.emplace_back(rb);

        if (fakeRelease) {

            BQA_LOGE("Faking releaseBufferCallback from transactionCompleteCallback %" PRIu64,

                     id.framenumber);

            BBQ_TRACE("FakeReleaseCallback");

        }

    }



    // Release all buffers that are beyond the ones that we need to hold

libs/gui/include/gui/BLASTBufferQueue.h

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ public: 
    void releaseBufferCallback(const ReleaseCallbackId& id, const sp<Fence>& releaseFence,

                               std::optional<uint32_t> currentMaxAcquiredBufferCount);

    void releaseBufferCallbackLocked(const ReleaseCallbackId& id, const sp<Fence>& releaseFence,

                               std::optional<uint32_t> currentMaxAcquiredBufferCount);

                                     std::optional<uint32_t> currentMaxAcquiredBufferCount,

                                     bool fakeRelease);

    void syncNextTransaction(std::function<void(SurfaceComposerClient::Transaction*)> callback,

                             bool acquireSingleBuffer = true);

    void stopContinuousSyncTransaction();