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

Commit 125a63c1 authored by Anton Ivanov's avatar Anton Ivanov Committed by Android (Google) Code Review
Browse files

Revert^3 "Use TransactionState in SurfaceFlinger." 

This reverts commit d7b71ac5.

Reason for revert: heap regression reported in b/406104970

Change-Id: Ic9e686b03b3fbe733a0781579a34b12df9e5a598
parent d7b71ac5

libs/gui/BLASTBufferQueue.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1032,7 +1032,7 @@ void BLASTBufferQueue::mergeWithNextTransaction(SurfaceComposerClient::Transacti 
        // Apply the transaction since we have already acquired the desired frame.

        t->setApplyToken(mApplyToken).apply();

    } else {

        mPendingTransactions.emplace_back(frameNumber, std::move(*t));

        mPendingTransactions.emplace_back(frameNumber, *t);

        // Clear the transaction so it can't be applied elsewhere.

        t->clear();

    }
@@ -1050,8 +1050,8 @@ void BLASTBufferQueue::applyPendingTransactions(uint64_t frameNumber) { 
void BLASTBufferQueue::mergePendingTransactions(SurfaceComposerClient::Transaction* t,

                                                uint64_t frameNumber) {

    auto mergeTransaction =

            [t, currentFrameNumber = frameNumber](

                    std::pair<uint64_t, SurfaceComposerClient::Transaction>& pendingTransaction) {

            [&t, currentFrameNumber = frameNumber](

                    std::tuple<uint64_t, SurfaceComposerClient::Transaction> pendingTransaction) {

                auto& [targetFrameNumber, transaction] = pendingTransaction;

                if (currentFrameNumber < targetFrameNumber) {

                    return false;

libs/gui/ISurfaceComposer.cpp

+114 −7
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <gui/ISurfaceComposer.h>

#include <gui/LayerState.h>

#include <gui/SchedulingPolicy.h>

#include <gui/TransactionState.h>

#include <private/gui/ParcelUtils.h>

#include <stdint.h>

#include <sys/types.h>
@@ -61,12 +60,54 @@ public: 


    virtual ~BpSurfaceComposer();



    status_t setTransactionState(TransactionState&& state) override {

    status_t setTransactionState(

            const FrameTimelineInfo& frameTimelineInfo, Vector<ComposerState>& state,

            Vector<DisplayState>& displays, uint32_t flags, const sp<IBinder>& applyToken,

            InputWindowCommands commands, int64_t desiredPresentTime, bool isAutoTimestamp,

            const std::vector<client_cache_t>& uncacheBuffers, bool hasListenerCallbacks,

            const std::vector<ListenerCallbacks>& listenerCallbacks, uint64_t transactionId,

            const std::vector<uint64_t>& mergedTransactionIds) override {

        Parcel data, reply;

        data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());

        SAFE_PARCEL(state.writeToParcel, &data);



        if (state.mFlags & ISurfaceComposer::eOneWay) {

        frameTimelineInfo.writeToParcel(&data);



        SAFE_PARCEL(data.writeUint32, static_cast<uint32_t>(state.size()));

        for (const auto& s : state) {

            SAFE_PARCEL(s.write, data);

        }



        SAFE_PARCEL(data.writeUint32, static_cast<uint32_t>(displays.size()));

        for (const auto& d : displays) {

            SAFE_PARCEL(d.write, data);

        }



        SAFE_PARCEL(data.writeUint32, flags);

        SAFE_PARCEL(data.writeStrongBinder, applyToken);

        SAFE_PARCEL(commands.write, data);

        SAFE_PARCEL(data.writeInt64, desiredPresentTime);

        SAFE_PARCEL(data.writeBool, isAutoTimestamp);

        SAFE_PARCEL(data.writeUint32, static_cast<uint32_t>(uncacheBuffers.size()));

        for (const client_cache_t& uncacheBuffer : uncacheBuffers) {

            SAFE_PARCEL(data.writeStrongBinder, uncacheBuffer.token.promote());

            SAFE_PARCEL(data.writeUint64, uncacheBuffer.id);

        }

        SAFE_PARCEL(data.writeBool, hasListenerCallbacks);



        SAFE_PARCEL(data.writeVectorSize, listenerCallbacks);

        for (const auto& [listener, callbackIds] : listenerCallbacks) {

            SAFE_PARCEL(data.writeStrongBinder, listener);

            SAFE_PARCEL(data.writeParcelableVector, callbackIds);

        }



        SAFE_PARCEL(data.writeUint64, transactionId);



        SAFE_PARCEL(data.writeUint32, static_cast<uint32_t>(mergedTransactionIds.size()));

        for (auto mergedTransactionId : mergedTransactionIds) {

            SAFE_PARCEL(data.writeUint64, mergedTransactionId);

        }



        if (flags & ISurfaceComposer::eOneWay) {

            return remote()->transact(BnSurfaceComposer::SET_TRANSACTION_STATE,

                    data, &reply, IBinder::FLAG_ONEWAY);

        } else {
@@ -91,9 +132,75 @@ status_t BnSurfaceComposer::onTransact( 
        case SET_TRANSACTION_STATE: {

            CHECK_INTERFACE(ISurfaceComposer, data, reply);



            TransactionState state;

            SAFE_PARCEL(state.readFromParcel, &data);

            return setTransactionState(std::move(state));

            FrameTimelineInfo frameTimelineInfo;

            frameTimelineInfo.readFromParcel(&data);



            uint32_t count = 0;

            SAFE_PARCEL_READ_SIZE(data.readUint32, &count, data.dataSize());

            Vector<ComposerState> state;

            state.setCapacity(count);

            for (size_t i = 0; i < count; i++) {

                ComposerState s;

                SAFE_PARCEL(s.read, data);

                state.add(s);

            }



            SAFE_PARCEL_READ_SIZE(data.readUint32, &count, data.dataSize());

            DisplayState d;

            Vector<DisplayState> displays;

            displays.setCapacity(count);

            for (size_t i = 0; i < count; i++) {

                SAFE_PARCEL(d.read, data);

                displays.add(d);

            }



            uint32_t stateFlags = 0;

            SAFE_PARCEL(data.readUint32, &stateFlags);

            sp<IBinder> applyToken;

            SAFE_PARCEL(data.readStrongBinder, &applyToken);

            InputWindowCommands inputWindowCommands;

            SAFE_PARCEL(inputWindowCommands.read, data);



            int64_t desiredPresentTime = 0;

            bool isAutoTimestamp = true;

            SAFE_PARCEL(data.readInt64, &desiredPresentTime);

            SAFE_PARCEL(data.readBool, &isAutoTimestamp);



            SAFE_PARCEL_READ_SIZE(data.readUint32, &count, data.dataSize());

            std::vector<client_cache_t> uncacheBuffers(count);

            sp<IBinder> tmpBinder;

            for (size_t i = 0; i < count; i++) {

                SAFE_PARCEL(data.readNullableStrongBinder, &tmpBinder);

                uncacheBuffers[i].token = tmpBinder;

                SAFE_PARCEL(data.readUint64, &uncacheBuffers[i].id);

            }



            bool hasListenerCallbacks = false;

            SAFE_PARCEL(data.readBool, &hasListenerCallbacks);



            std::vector<ListenerCallbacks> listenerCallbacks;

            int32_t listenersSize = 0;

            SAFE_PARCEL_READ_SIZE(data.readInt32, &listenersSize, data.dataSize());

            for (int32_t i = 0; i < listenersSize; i++) {

                SAFE_PARCEL(data.readStrongBinder, &tmpBinder);

                std::vector<CallbackId> callbackIds;

                SAFE_PARCEL(data.readParcelableVector, &callbackIds);

                listenerCallbacks.emplace_back(tmpBinder, callbackIds);

            }



            uint64_t transactionId = -1;

            SAFE_PARCEL(data.readUint64, &transactionId);



            SAFE_PARCEL_READ_SIZE(data.readUint32, &count, data.dataSize());

            std::vector<uint64_t> mergedTransactions(count);

            for (size_t i = 0; i < count; i++) {

                SAFE_PARCEL(data.readUint64, &mergedTransactions[i]);

            }



            return setTransactionState(frameTimelineInfo, state, displays, stateFlags, applyToken,

                                       std::move(inputWindowCommands), desiredPresentTime,

                                       isAutoTimestamp, uncacheBuffers, hasListenerCallbacks,

                                       listenerCallbacks, transactionId, mergedTransactions);

        }

        case GET_SCHEDULING_POLICY: {

            gui::SchedulingPolicy policy;

libs/gui/SurfaceComposerClient.cpp

+278 −57

File changed.

Preview size limit exceeded, changes collapsed.

libs/gui/include/gui/BLASTBufferQueue.h

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ private: 
    std::function<void(SurfaceComposerClient::Transaction*)> mTransactionReadyCallback

            GUARDED_BY(mMutex);

    SurfaceComposerClient::Transaction* mSyncTransaction GUARDED_BY(mMutex);

    std::vector<std::pair<uint64_t /* framenumber */, SurfaceComposerClient::Transaction>>

    std::vector<std::tuple<uint64_t /* framenumber */, SurfaceComposerClient::Transaction>>

            mPendingTransactions GUARDED_BY(mMutex);



    std::queue<std::pair<uint64_t, FrameTimelineInfo>> mPendingFrameTimelines GUARDED_BY(mMutex);

libs/gui/include/gui/ISurfaceComposer.h

+7 −2
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ struct DisplayState; 
struct InputWindowCommands;

class HdrCapabilities;

class Rect;

class TransactionState;



using gui::FrameTimelineInfo;

using gui::IDisplayEventConnection;
@@ -106,7 +105,13 @@ public: 
    };



    /* open/close transactions. requires ACCESS_SURFACE_FLINGER permission */

    virtual status_t setTransactionState(TransactionState&& state) = 0;

    virtual status_t setTransactionState(

            const FrameTimelineInfo& frameTimelineInfo, Vector<ComposerState>& state,

            Vector<DisplayState>& displays, uint32_t flags, const sp<IBinder>& applyToken,

            InputWindowCommands inputWindowCommands, int64_t desiredPresentTime,

            bool isAutoTimestamp, const std::vector<client_cache_t>& uncacheBuffer,

            bool hasListenerCallbacks, const std::vector<ListenerCallbacks>& listenerCallbacks,

            uint64_t transactionId, const std::vector<uint64_t>& mergedTransactionIds) = 0;

};



// ----------------------------------------------------------------------------