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

Commit ad2c0589 authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge "[bufferqueue] Add better trace points for buffer allocations" into udc-dev am: 2d460513 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22794458



Change-Id: I3d9bd3b5c0dc5dd2357b7988ffb752e3b75f8bb5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 80bb88e5 2d460513

libs/gui/BufferQueueConsumer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <gui/BufferQueueCore.h>

#include <gui/IConsumerListener.h>

#include <gui/IProducerListener.h>

#include <gui/TraceUtils.h>



#include <private/gui/BufferQueueThreadState.h>

#ifndef __ANDROID_VNDK__
@@ -646,7 +647,7 @@ status_t BufferQueueConsumer::setMaxBufferCount(int bufferCount) { 


status_t BufferQueueConsumer::setMaxAcquiredBufferCount(

        int maxAcquiredBuffers) {

    ATRACE_CALL();

    ATRACE_FORMAT("%s(%d)", __func__, maxAcquiredBuffers);



    if (maxAcquiredBuffers < 1 ||

            maxAcquiredBuffers > BufferQueueCore::MAX_MAX_ACQUIRED_BUFFERS) {

libs/gui/BufferQueueProducer.cpp

+16 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <gui/GLConsumer.h>

#include <gui/IConsumerListener.h>

#include <gui/IProducerListener.h>

#include <gui/TraceUtils.h>

#include <private/gui/BufferQueueThreadState.h>



#include <utils/Log.h>
@@ -125,7 +126,7 @@ status_t BufferQueueProducer::setMaxDequeuedBufferCount( 


status_t BufferQueueProducer::setMaxDequeuedBufferCount(int maxDequeuedBuffers,

                                                        int* maxBufferCount) {

    ATRACE_CALL();

    ATRACE_FORMAT("%s(%d)", __func__, maxDequeuedBuffers);

    BQ_LOGV("setMaxDequeuedBufferCount: maxDequeuedBuffers = %d",

            maxDequeuedBuffers);
@@ -502,6 +503,20 @@ status_t BufferQueueProducer::dequeueBuffer(int* outSlot, sp<android::Fence>* ou 
        if ((buffer == nullptr) ||

                buffer->needsReallocation(width, height, format, BQ_LAYER_COUNT, usage))

        {

            if (CC_UNLIKELY(ATRACE_ENABLED())) {

                if (buffer == nullptr) {

                    ATRACE_FORMAT_INSTANT("%s buffer reallocation: null", mConsumerName.string());

                } else {

                    ATRACE_FORMAT_INSTANT("%s buffer reallocation actual %dx%d format:%d "

                                          "layerCount:%d "

                                          "usage:%d requested: %dx%d format:%d layerCount:%d "

                                          "usage:%d ",

                                          mConsumerName.string(), width, height, format,

                                          BQ_LAYER_COUNT, usage, buffer->getWidth(),

                                          buffer->getHeight(), buffer->getPixelFormat(),

                                          buffer->getLayerCount(), buffer->getUsage());

                }

            }

            mSlots[found].mAcquireCalled = false;

            mSlots[found].mGraphicBuffer = nullptr;

            mSlots[found].mRequestBufferCalled = false;