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

Commit f377a76a authored by Tianyu Jiang's avatar Tianyu Jiang
Browse files

Fix code style violation in the variables in BufferHubDefs::MetadataHeader 

Violation: variables should be lowerCaseCamel in the following directories:
frameworks/native/libs/ui and frameworks/native/services/bufferhub


Test: m, mma
Bug: 68273829
Change-Id: I7dc56ec17089456f98b018032f04f779b12632b2
parent 101843de

libs/ui/BufferHubBuffer.cpp

+12 −13
Original line number Diff line number Diff line
@@ -78,15 +78,14 @@ BufferHubBuffer::BufferHubBuffer(uint32_t width, uint32_t height, uint32_t layer 
    BufferHubStatus ret;

    sp<IBufferClient> client;

    BufferTraits bufferTraits;

    IBufferHub::allocateBuffer_cb alloc_cb = [&](const auto& status, const auto& outClient,

    IBufferHub::allocateBuffer_cb allocCb = [&](const auto& status, const auto& outClient,

                                                const auto& outTraits) {

        ret = status;

        client = std::move(outClient);

        bufferTraits = std::move(outTraits);

    };



    if (!bufferhub->allocateBuffer(desc, static_cast<uint32_t>(userMetadataSize), alloc_cb)

                 .isOk()) {

    if (!bufferhub->allocateBuffer(desc, static_cast<uint32_t>(userMetadataSize), allocCb).isOk()) {

        ALOGE("%s: allocateBuffer transaction failed!", __FUNCTION__);

        return;

    } else if (ret != BufferHubStatus::NO_ERROR) {
@@ -115,7 +114,7 @@ BufferHubBuffer::BufferHubBuffer(const sp<NativeHandle>& token) { 
    BufferHubStatus ret;

    sp<IBufferClient> client;

    BufferTraits bufferTraits;

    IBufferHub::importBuffer_cb import_cb = [&](const auto& status, const auto& outClient,

    IBufferHub::importBuffer_cb importCb = [&](const auto& status, const auto& outClient,

                                               const auto& outTraits) {

        ret = status;

        client = std::move(outClient);
@@ -124,7 +123,7 @@ BufferHubBuffer::BufferHubBuffer(const sp<NativeHandle>& token) { 


    // hidl_handle(native_handle_t*) simply creates a raw pointer reference withouth ownership

    // transfer.

    if (!bufferhub->importBuffer(hidl_handle(token.get()->handle()), import_cb).isOk()) {

    if (!bufferhub->importBuffer(hidl_handle(token.get()->handle()), importCb).isOk()) {

        ALOGE("%s: importBuffer transaction failed!", __FUNCTION__);

        return;

    } else if (ret != BufferHubStatus::NO_ERROR) {
@@ -210,9 +209,9 @@ int BufferHubBuffer::initWithBufferTraits(const BufferTraits& bufferTraits) { 


    // Populate shortcuts to the atomics in metadata.

    auto metadataHeader = mMetadata.metadataHeader();

    mBufferState = &metadataHeader->buffer_state;

    mFenceState = &metadataHeader->fence_state;

    mActiveClientsBitMask = &metadataHeader->active_clients_bit_mask;

    mBufferState = &metadataHeader->bufferState;

    mFenceState = &metadataHeader->fenceState;

    mActiveClientsBitMask = &metadataHeader->activeClientsBitMask;

    // The C++ standard recommends (but does not require) that lock-free atomic operations are

    // also address-free, that is, suitable for communication between processes using shared

    // memory.
@@ -230,7 +229,7 @@ int BufferHubBuffer::initWithBufferTraits(const BufferTraits& bufferTraits) { 
    mClientStateMask = clientBitMask;



    // TODO(b/112012161) Set up shared fences.

    ALOGD("%s: id=%d, buffer_state=%" PRIx32 ".", __FUNCTION__, mId,

    ALOGD("%s: id=%d, mBufferState=%" PRIx32 ".", __FUNCTION__, mId,

          mBufferState->load(std::memory_order_acquire));

    return 0;

}
@@ -336,12 +335,12 @@ sp<NativeHandle> BufferHubBuffer::duplicate() { 


    hidl_handle token;

    BufferHubStatus ret;

    IBufferClient::duplicate_cb dup_cb = [&](const auto& outToken, const auto& status) {

    IBufferClient::duplicate_cb dupCb = [&](const auto& outToken, const auto& status) {

        token = std::move(outToken);

        ret = status;

    };



    if (!mBufferClient->duplicate(dup_cb).isOk()) {

    if (!mBufferClient->duplicate(dupCb).isOk()) {

        ALOGE("%s: duplicate transaction failed!", __FUNCTION__);

        return nullptr;

    } else if (ret != BufferHubStatus::NO_ERROR) {

libs/ui/include/ui/BufferHubBuffer.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public: 


    const BufferHubEventFd& eventFd() const { return mEventFd; }



    // Returns the current value of MetadataHeader::buffer_state.

    // Returns the current value of MetadataHeader::bufferState.

    uint32_t bufferState() const { return mBufferState->load(std::memory_order_acquire); }



    // A state mask which is unique to a buffer hub client among all its siblings sharing the same

libs/ui/include/ui/BufferHubDefs.h

+33 −33
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ namespace BufferHubDefs { 
// Single buffer clients (up to 16) ownership signal.

// 32-bit atomic unsigned int.

// Each client takes 2 bits. The first bit locates in the first 16 bits of

// buffer_state; the second bit locates in the last 16 bits of buffer_state.

// bufferState; the second bit locates in the last 16 bits of bufferState.

// Client states:

// Gained state 11. Exclusive write state.

// Posted state 10.
@@ -64,9 +64,9 @@ static constexpr uint32_t kFirstClientBitMask = (1U << kMaxNumberOfClients) + 1U 


// Returns true if any of the client is in gained state.

static inline bool isAnyClientGained(uint32_t state) {

    uint32_t high_bits = state >> kMaxNumberOfClients;

    uint32_t low_bits = state & kLowbitsMask;

    return high_bits == low_bits && low_bits != 0U;

    uint32_t highBits = state >> kMaxNumberOfClients;

    uint32_t lowBits = state & kLowbitsMask;

    return highBits == lowBits && lowBits != 0U;

}



// Returns true if the input client is in gained state.
@@ -76,34 +76,34 @@ static inline bool isClientGained(uint32_t state, uint32_t client_bit_mask) { 


// Returns true if any of the client is in posted state.

static inline bool isAnyClientPosted(uint32_t state) {

    uint32_t high_bits = state >> kMaxNumberOfClients;

    uint32_t low_bits = state & kLowbitsMask;

    uint32_t posted_or_acquired = high_bits ^ low_bits;

    return posted_or_acquired & high_bits;

    uint32_t highBits = state >> kMaxNumberOfClients;

    uint32_t lowBits = state & kLowbitsMask;

    uint32_t postedOrAcquired = highBits ^ lowBits;

    return postedOrAcquired & highBits;

}



// Returns true if the input client is in posted state.

static inline bool isClientPosted(uint32_t state, uint32_t client_bit_mask) {

    uint32_t client_bits = state & client_bit_mask;

    if (client_bits == 0U) return false;

    uint32_t low_bits = client_bits & kLowbitsMask;

    return low_bits == 0U;

    uint32_t clientBits = state & client_bit_mask;

    if (clientBits == 0U) return false;

    uint32_t lowBits = clientBits & kLowbitsMask;

    return lowBits == 0U;

}



// Return true if any of the client is in acquired state.

static inline bool isAnyClientAcquired(uint32_t state) {

    uint32_t high_bits = state >> kMaxNumberOfClients;

    uint32_t low_bits = state & kLowbitsMask;

    uint32_t posted_or_acquired = high_bits ^ low_bits;

    return posted_or_acquired & low_bits;

    uint32_t highBits = state >> kMaxNumberOfClients;

    uint32_t lowBits = state & kLowbitsMask;

    uint32_t postedOrAcquired = highBits ^ lowBits;

    return postedOrAcquired & lowBits;

}



// Return true if the input client is in acquired state.

static inline bool isClientAcquired(uint32_t state, uint32_t client_bit_mask) {

    uint32_t client_bits = state & client_bit_mask;

    if (client_bits == 0U) return false;

    uint32_t high_bits = client_bits & kHighBitsMask;

    return high_bits == 0U;

    uint32_t clientBits = state & client_bit_mask;

    if (clientBits == 0U) return false;

    uint32_t highBits = clientBits & kHighBitsMask;

    return highBits == 0U;

}



// Returns true if the input client is in released state.
@@ -114,12 +114,12 @@ static inline bool isClientReleased(uint32_t state, uint32_t client_bit_mask) { 
// Returns the next available buffer client's client_state_masks.

// @params union_bits. Union of all existing clients' client_state_masks.

static inline uint32_t findNextAvailableClientStateMask(uint32_t union_bits) {

    uint32_t low_union = union_bits & kLowbitsMask;

    if (low_union == kLowbitsMask) return 0U;

    uint32_t incremented = low_union + 1U;

    uint32_t difference = incremented ^ low_union;

    uint32_t new_low_bit = (difference + 1U) >> 1;

    return new_low_bit + (new_low_bit << kMaxNumberOfClients);

    uint32_t lowUnion = union_bits & kLowbitsMask;

    if (lowUnion == kLowbitsMask) return 0U;

    uint32_t incremented = lowUnion + 1U;

    uint32_t difference = incremented ^ lowUnion;

    uint32_t newLowBit = (difference + 1U) >> 1;

    return newLowBit + (newLowBit << kMaxNumberOfClients);

}



struct __attribute__((aligned(8))) MetadataHeader {
@@ -129,22 +129,22 @@ struct __attribute__((aligned(8))) MetadataHeader { 
    // platform (include Apps and vendor HAL).



    // Every client takes up one bit from the higher 32 bits and one bit from the lower 32 bits in

    // buffer_state.

    std::atomic<uint32_t> buffer_state;

    // bufferState.

    std::atomic<uint32_t> bufferState;



    // Every client takes up one bit in fence_state. Only the lower 32 bits are valid. The upper 32

    // Every client takes up one bit in fenceState. Only the lower 32 bits are valid. The upper 32

    // bits are there for easier manipulation, but the value should be ignored.

    std::atomic<uint32_t> fence_state;

    std::atomic<uint32_t> fenceState;



    // Every client takes up one bit from the higher 32 bits and one bit from the lower 32 bits in

    // active_clients_bit_mask.

    std::atomic<uint32_t> active_clients_bit_mask;

    // activeClientsBitMask.

    std::atomic<uint32_t> activeClientsBitMask;



    // Explicit padding 4 bytes.

    uint32_t padding;



    // The index of the buffer queue where the buffer belongs to.

    uint64_t queue_index;

    uint64_t queueIndex;



    // Public data format, which should be updated with caution. See more details in dvr_api.h

    DvrNativeBufferMetadata metadata;

libs/ui/tests/BufferHubMetadata_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ TEST_F(BufferHubMetadataTest, Import_Success) { 


    // Check if the newly allocated buffer is initialized in released state (i.e.

    // state equals to 0U).

    EXPECT_TRUE(mh1->buffer_state.load() == 0U);

    EXPECT_TRUE(mh1->bufferState.load() == 0U);



    EXPECT_TRUE(m2.isValid());

    BufferHubDefs::MetadataHeader* mh2 = m2.metadataHeader();
@@ -59,7 +59,7 @@ TEST_F(BufferHubMetadataTest, Import_Success) { 


    // Check if the newly allocated buffer is initialized in released state (i.e.

    // state equals to 0U).

    EXPECT_TRUE(mh2->buffer_state.load() == 0U);

    EXPECT_TRUE(mh2->bufferState.load() == 0U);

}



TEST_F(BufferHubMetadataTest, MoveMetadataInvalidatesOldOne) {

libs/vr/libbufferhub/buffer_hub_base.cpp

+3 −3
Original line number Diff line number Diff line
@@ -122,15 +122,15 @@ int BufferHubBase::ImportBuffer() { 
  // are mapped from shared memory as an atomic object. The std::atomic's

  // constructor will not be called so that the original value stored in the

  // memory region will be preserved.

  buffer_state_ = &metadata_header_->buffer_state;

  buffer_state_ = &metadata_header_->bufferState;

  ALOGD_IF(TRACE,

           "BufferHubBase::ImportBuffer: id=%d, buffer_state=%" PRIx32 ".",

           id(), buffer_state_->load(std::memory_order_acquire));

  fence_state_ = &metadata_header_->fence_state;

  fence_state_ = &metadata_header_->fenceState;

  ALOGD_IF(TRACE,

           "BufferHubBase::ImportBuffer: id=%d, fence_state=%" PRIx32 ".", id(),

           fence_state_->load(std::memory_order_acquire));

  active_clients_bit_mask_ = &metadata_header_->active_clients_bit_mask;

  active_clients_bit_mask_ = &metadata_header_->activeClientsBitMask;

  ALOGD_IF(

      TRACE,

      "BufferHubBase::ImportBuffer: id=%d, active_clients_bit_mask=%" PRIx32