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

Commit 0a3e7847 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Do not block on allocating buffers 

There is really no point in doing that because this can be done
in an async way such that the first and subsequent dequeueBuffer
still don't block because at that point allocation is very likely
done.

Furthermore, avoid calling setAsyncMode initially, as it will also
block RT on buffer allocation. However, the default is false in
any case, so we really don't need to call it.

Also, only allocate one buffer at a time and don't block in
dequeueBuffer on allocating buffers. It will likely have one buffer
available already, and there is no point in waiting for other
buffers to be allocated.

Test: Press home with memory contention, observe less delay.
Test: General smoke testing for increased jank
Bug: 111517695
Change-Id: I9deb435013b2503178d2fe032151c1aaedd667af
parent 9885bd4b

libs/gui/BufferQueueProducer.cpp

+4 −3
Original line number Diff line number Diff line
@@ -381,7 +381,6 @@ status_t BufferQueueProducer::dequeueBuffer(int* outSlot, sp<android::Fence>* ou 


    { // Autolock scope

        Mutex::Autolock lock(mCore->mMutex);

        mCore->waitWhileAllocatingLocked();



        if (format == 0) {

            format = mCore->mDefaultBufferFormat;
@@ -1345,7 +1344,9 @@ void BufferQueueProducer::allocateBuffers(uint32_t width, uint32_t height, 
                return;

            }



            newBufferCount = mCore->mFreeSlots.size();

            // Only allocate one buffer at a time to reduce risks of overlapping an allocation from

            // both allocateBuffers and dequeueBuffer.

            newBufferCount = mCore->mFreeSlots.empty() ? 0 : 1;

            if (newBufferCount == 0) {

                return;

            }

libs/gui/IGraphicBufferProducer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ public: 
        data.writeUint32(height);

        data.writeInt32(static_cast<int32_t>(format));

        data.writeUint64(usage);

        status_t result = remote()->transact(ALLOCATE_BUFFERS, data, &reply);

        status_t result = remote()->transact(ALLOCATE_BUFFERS, data, &reply, TF_ONE_WAY);

        if (result != NO_ERROR) {

            ALOGE("allocateBuffers failed to transact: %d", result);

        }

libs/gui/Surface.cpp

+5 −1
Original line number Diff line number Diff line
@@ -464,8 +464,12 @@ int Surface::setSwapInterval(int interval) { 
    if (interval > maxSwapInterval)

        interval = maxSwapInterval;



    const bool wasSwapIntervalZero = mSwapIntervalZero;

    mSwapIntervalZero = (interval == 0);



    if (mSwapIntervalZero != wasSwapIntervalZero) {

        mGraphicBufferProducer->setAsyncMode(mSwapIntervalZero);

    }



    return NO_ERROR;

}