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

Commit f478aa16 authored by Sungtak Lee's avatar Sungtak Lee
Browse files

bufferpool@2.0: Ensure uniqueness of connection id 

Currently same connection id can be given to different connections if
they don't belong to the same bufferpool.

Ensure uniqueness of connection id for each connection.

Bug: 323793249
Change-Id: I7ab772dedcb1d6cc4dff204b845ded206efabc73
parent a4f686d4

media/module/bufferpool/2.0/AccessorImpl.cpp

+23 −7
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#define LOG_TAG "BufferPoolAccessor2.0"

//#define LOG_NDEBUG 0



#include <android-base/no_destructor.h>



#include <sys/types.h>

#include <stdint.h>

#include <time.h>
@@ -147,7 +149,25 @@ static constexpr uint32_t kSeqIdVndkBit = 0; 
#endif



static constexpr uint32_t kSeqIdMax = 0x7fffffff;

uint32_t Accessor::Impl::sSeqId = time(nullptr) & kSeqIdMax;



Accessor::Impl::ConnectionIdGenerator::ConnectionIdGenerator() {

    mSeqId = static_cast<uint32_t>(time(nullptr) & kSeqIdMax);

    mPid = static_cast<int32_t>(getpid());

}



ConnectionId Accessor::Impl::ConnectionIdGenerator::getConnectionId() {

    uint32_t seq;

    {

        std::lock_guard<std::mutex> l(mLock);

        seq = mSeqId;

        if (mSeqId == kSeqIdMax) {

            mSeqId = 0;

        } else {

            ++mSeqId;

        }

    }

    return (int64_t)mPid << 32 | seq | kSeqIdVndkBit;

}



Accessor::Impl::Impl(

        const std::shared_ptr<BufferPoolAllocator> &allocator)
@@ -163,13 +183,14 @@ ResultStatus Accessor::Impl::connect( 
        uint32_t *pMsgId,

        const StatusDescriptor** statusDescPtr,

        const InvalidationDescriptor** invDescPtr) {

    static ::android::base::NoDestructor<ConnectionIdGenerator> sConIdGenerator;

    sp<Connection> newConnection = new Connection();

    ResultStatus status = ResultStatus::CRITICAL_ERROR;

    {

        std::lock_guard<std::mutex> lock(mBufferPool.mMutex);

        if (newConnection) {

            int32_t pid = getpid();

            ConnectionId id = (int64_t)pid << 32 | sSeqId | kSeqIdVndkBit;

            ConnectionId id = sConIdGenerator->getConnectionId();

            status = mBufferPool.mObserver.open(id, statusDescPtr);

            if (status == ResultStatus::OK) {

                newConnection->initialize(accessor, id);
@@ -179,11 +200,6 @@ ResultStatus Accessor::Impl::connect( 
                mBufferPool.mConnectionIds.insert(id);

                mBufferPool.mInvalidationChannel.getDesc(invDescPtr);

                mBufferPool.mInvalidation.onConnect(id, observer);

                if (sSeqId == kSeqIdMax) {

                   sSeqId = 0;

                } else {

                    ++sSeqId;

                }

            }



        }

media/module/bufferpool/2.0/AccessorImpl.h

+8 −1
Original line number Diff line number Diff line
@@ -77,7 +77,14 @@ public: 
private:

    // ConnectionId = pid : (timestamp_created + seqId)

    // in order to guarantee uniqueness for each connection

    static uint32_t sSeqId;

    struct ConnectionIdGenerator {

        int32_t mPid;

        uint32_t mSeqId;

        std::mutex mLock;



        ConnectionIdGenerator();

        ConnectionId getConnectionId();

    };



    const std::shared_ptr<BufferPoolAllocator> mAllocator;

media/module/bufferpool/2.0/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ cc_defaults { 
    export_include_dirs: [

        "include",

    ],

    header_libs: [

        "libbase_headers",

    ],

    shared_libs: [

        "libcutils",

        "libfmq",