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

Commit be8ef46e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use String8/16 c_str [graphics]" into udc-dev-plus-aosp am: 1bcbf26f am: cdbed993 

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



Change-Id: I931d494fb42b7db3df399ab51a7da3a38fed5999
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 937806e6 cdbed993

libs/gui/BufferItemConsumer.cpp

+5 −5
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ 
#include <gui/BufferItem.h>

#include <gui/BufferItemConsumer.h>



#define BI_LOGV(x, ...) ALOGV("[%s] " x, mName.string(), ##__VA_ARGS__)

//#define BI_LOGD(x, ...) ALOGD("[%s] " x, mName.string(), ##__VA_ARGS__)

//#define BI_LOGI(x, ...) ALOGI("[%s] " x, mName.string(), ##__VA_ARGS__)

//#define BI_LOGW(x, ...) ALOGW("[%s] " x, mName.string(), ##__VA_ARGS__)

#define BI_LOGE(x, ...) ALOGE("[%s] " x, mName.string(), ##__VA_ARGS__)

#define BI_LOGV(x, ...) ALOGV("[%s] " x, mName.c_str(), ##__VA_ARGS__)

// #define BI_LOGD(x, ...) ALOGD("[%s] " x, mName.c_str(), ##__VA_ARGS__)

// #define BI_LOGI(x, ...) ALOGI("[%s] " x, mName.c_str(), ##__VA_ARGS__)

// #define BI_LOGW(x, ...) ALOGW("[%s] " x, mName.c_str(), ##__VA_ARGS__)

#define BI_LOGE(x, ...) ALOGE("[%s] " x, mName.c_str(), ##__VA_ARGS__)



namespace android {

libs/gui/BufferQueueConsumer.cpp

+7 −8
Original line number Diff line number Diff line
@@ -47,23 +47,23 @@ namespace android { 


// Macros for include BufferQueueCore information in log messages

#define BQ_LOGV(x, ...)                                                                           \

    ALOGV("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(),            \

    ALOGV("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(),             \

          mCore->mUniqueId, mCore->mConnectedApi, mCore->mConnectedPid, (mCore->mUniqueId) >> 32, \

          ##__VA_ARGS__)

#define BQ_LOGD(x, ...)                                                                           \

    ALOGD("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(),            \

    ALOGD("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(),             \

          mCore->mUniqueId, mCore->mConnectedApi, mCore->mConnectedPid, (mCore->mUniqueId) >> 32, \

          ##__VA_ARGS__)

#define BQ_LOGI(x, ...)                                                                           \

    ALOGI("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(),            \

    ALOGI("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(),             \

          mCore->mUniqueId, mCore->mConnectedApi, mCore->mConnectedPid, (mCore->mUniqueId) >> 32, \

          ##__VA_ARGS__)

#define BQ_LOGW(x, ...)                                                                           \

    ALOGW("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(),            \

    ALOGW("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(),             \

          mCore->mUniqueId, mCore->mConnectedApi, mCore->mConnectedPid, (mCore->mUniqueId) >> 32, \

          ##__VA_ARGS__)

#define BQ_LOGE(x, ...)                                                                           \

    ALOGE("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(),            \

    ALOGE("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(),             \

          mCore->mUniqueId, mCore->mConnectedApi, mCore->mConnectedPid, (mCore->mUniqueId) >> 32, \

          ##__VA_ARGS__)
@@ -298,8 +298,7 @@ status_t BufferQueueConsumer::acquireBuffer(BufferItem* outBuffer, 
        // decrease.

        mCore->mDequeueCondition.notify_all();



        ATRACE_INT(mCore->mConsumerName.string(),

                static_cast<int32_t>(mCore->mQueue.size()));

        ATRACE_INT(mCore->mConsumerName.c_str(), static_cast<int32_t>(mCore->mQueue.size()));

#ifndef NO_BINDER

        mCore->mOccupancyTracker.registerOccupancyChange(mCore->mQueue.size());

#endif
@@ -718,7 +717,7 @@ status_t BufferQueueConsumer::setMaxAcquiredBufferCount( 


status_t BufferQueueConsumer::setConsumerName(const String8& name) {

    ATRACE_CALL();

    BQ_LOGV("setConsumerName: '%s'", name.string());

    BQ_LOGV("setConsumerName: '%s'", name.c_str());

    std::lock_guard<std::mutex> lock(mCore->mMutex);

    mCore->mConsumerName = name;

    mConsumerName = name;

libs/gui/BufferQueueCore.cpp

+25 −26
Original line number Diff line number Diff line
@@ -42,19 +42,19 @@ namespace android { 


// Macros for include BufferQueueCore information in log messages

#define BQ_LOGV(x, ...)                                                                          \

    ALOGV("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(), mUniqueId, \

    ALOGV("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(), mUniqueId, \

          mConnectedApi, mConnectedPid, mUniqueId >> 32, ##__VA_ARGS__)

#define BQ_LOGD(x, ...)                                                                          \

    ALOGD("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(), mUniqueId, \

    ALOGD("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(), mUniqueId, \

          mConnectedApi, mConnectedPid, mUniqueId >> 32, ##__VA_ARGS__)

#define BQ_LOGI(x, ...)                                                                          \

    ALOGI("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(), mUniqueId, \

    ALOGI("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(), mUniqueId, \

          mConnectedApi, mConnectedPid, mUniqueId >> 32, ##__VA_ARGS__)

#define BQ_LOGW(x, ...)                                                                          \

    ALOGW("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(), mUniqueId, \

    ALOGW("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(), mUniqueId, \

          mConnectedApi, mConnectedPid, mUniqueId >> 32, ##__VA_ARGS__)

#define BQ_LOGE(x, ...)                                                                          \

    ALOGE("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(), mUniqueId, \

    ALOGE("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(), mUniqueId, \

          mConnectedApi, mConnectedPid, mUniqueId >> 32, ##__VA_ARGS__)



static String8 getUniqueName() {
@@ -146,23 +146,23 @@ BufferQueueCore::~BufferQueueCore() {} 
void BufferQueueCore::dumpState(const String8& prefix, String8* outResult) const {

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



    outResult->appendFormat("%s- BufferQueue ", prefix.string());

    outResult->appendFormat("%s- BufferQueue ", prefix.c_str());

    outResult->appendFormat("mMaxAcquiredBufferCount=%d mMaxDequeuedBufferCount=%d\n",

                            mMaxAcquiredBufferCount, mMaxDequeuedBufferCount);

    outResult->appendFormat("%s  mDequeueBufferCannotBlock=%d mAsyncMode=%d\n", prefix.string(),

    outResult->appendFormat("%s  mDequeueBufferCannotBlock=%d mAsyncMode=%d\n", prefix.c_str(),

                            mDequeueBufferCannotBlock, mAsyncMode);

    outResult->appendFormat("%s  mQueueBufferCanDrop=%d mLegacyBufferDrop=%d\n", prefix.string(),

    outResult->appendFormat("%s  mQueueBufferCanDrop=%d mLegacyBufferDrop=%d\n", prefix.c_str(),

                            mQueueBufferCanDrop, mLegacyBufferDrop);

    outResult->appendFormat("%s  default-size=[%dx%d] default-format=%d ", prefix.string(),

    outResult->appendFormat("%s  default-size=[%dx%d] default-format=%d ", prefix.c_str(),

                            mDefaultWidth, mDefaultHeight, mDefaultBufferFormat);

    outResult->appendFormat("%s  transform-hint=%02x frame-counter=%" PRIu64 "\n", prefix.string(),

    outResult->appendFormat("%s  transform-hint=%02x frame-counter=%" PRIu64 "\n", prefix.c_str(),

                            mTransformHint, mFrameCounter);

    outResult->appendFormat("%s  mTransformHintInUse=%02x mAutoPrerotation=%d\n", prefix.string(),

    outResult->appendFormat("%s  mTransformHintInUse=%02x mAutoPrerotation=%d\n", prefix.c_str(),

                            mTransformHintInUse, mAutoPrerotation);



    outResult->appendFormat("%sFIFO(%zu):\n", prefix.string(), mQueue.size());

    outResult->appendFormat("%sFIFO(%zu):\n", prefix.c_str(), mQueue.size());



    outResult->appendFormat("%s(mConsumerName=%s, ", prefix.string(), mConsumerName.string());

    outResult->appendFormat("%s(mConsumerName=%s, ", prefix.c_str(), mConsumerName.c_str());



    outResult->appendFormat("mConnectedApi=%d, mConsumerUsageBits=%" PRIu64 ", ", mConnectedApi,

                            mConsumerUsageBits);
@@ -173,12 +173,11 @@ void BufferQueueCore::dumpState(const String8& prefix, String8* outResult) const 
    getProcessName(mConnectedPid, producerProcName);

    getProcessName(pid, consumerProcName);

    outResult->appendFormat("mId=%" PRIx64 ", producer=[%d:%s], consumer=[%d:%s])\n", mUniqueId,

                            mConnectedPid, producerProcName.string(), pid,

                            consumerProcName.string());

                            mConnectedPid, producerProcName.c_str(), pid, consumerProcName.c_str());

    Fifo::const_iterator current(mQueue.begin());

    while (current != mQueue.end()) {

        double timestamp = current->mTimestamp / 1e9;

        outResult->appendFormat("%s  %02d:%p ", prefix.string(), current->mSlot,

        outResult->appendFormat("%s  %02d:%p ", prefix.c_str(), current->mSlot,

                                current->mGraphicBuffer.get());

        outResult->appendFormat("crop=[%d,%d,%d,%d] ", current->mCrop.left, current->mCrop.top,

                                current->mCrop.right, current->mCrop.bottom);
@@ -187,12 +186,12 @@ void BufferQueueCore::dumpState(const String8& prefix, String8* outResult) const 
        ++current;

    }



    outResult->appendFormat("%sSlots:\n", prefix.string());

    outResult->appendFormat("%sSlots:\n", prefix.c_str());

    for (int s : mActiveBuffers) {

        const sp<GraphicBuffer>& buffer(mSlots[s].mGraphicBuffer);

        // A dequeued buffer might be null if it's still being allocated

        if (buffer.get()) {

            outResult->appendFormat("%s %s[%02d:%p] ", prefix.string(),

            outResult->appendFormat("%s %s[%02d:%p] ", prefix.c_str(),

                                    (mSlots[s].mBufferState.isAcquired()) ? ">" : " ", s,

                                    buffer.get());

            outResult->appendFormat("state=%-8s %p frame=%" PRIu64, mSlots[s].mBufferState.string(),
@@ -200,14 +199,14 @@ void BufferQueueCore::dumpState(const String8& prefix, String8* outResult) const 
            outResult->appendFormat(" [%4ux%4u:%4u,%3X]\n", buffer->width, buffer->height,

                                    buffer->stride, buffer->format);

        } else {

            outResult->appendFormat("%s  [%02d:%p] ", prefix.string(), s, buffer.get());

            outResult->appendFormat("%s  [%02d:%p] ", prefix.c_str(), s, buffer.get());

            outResult->appendFormat("state=%-8s frame=%" PRIu64 "\n",

                                    mSlots[s].mBufferState.string(), mSlots[s].mFrameNumber);

        }

    }

    for (int s : mFreeBuffers) {

        const sp<GraphicBuffer>& buffer(mSlots[s].mGraphicBuffer);

        outResult->appendFormat("%s  [%02d:%p] ", prefix.string(), s, buffer.get());

        outResult->appendFormat("%s  [%02d:%p] ", prefix.c_str(), s, buffer.get());

        outResult->appendFormat("state=%-8s %p frame=%" PRIu64, mSlots[s].mBufferState.string(),

                                buffer->handle, mSlots[s].mFrameNumber);

        outResult->appendFormat(" [%4ux%4u:%4u,%3X]\n", buffer->width, buffer->height,
@@ -216,7 +215,7 @@ void BufferQueueCore::dumpState(const String8& prefix, String8* outResult) const 


    for (int s : mFreeSlots) {

        const sp<GraphicBuffer>& buffer(mSlots[s].mGraphicBuffer);

        outResult->appendFormat("%s  [%02d:%p] state=%-8s\n", prefix.string(), s, buffer.get(),

        outResult->appendFormat("%s  [%02d:%p] state=%-8s\n", prefix.c_str(), s, buffer.get(),

                                mSlots[s].mBufferState.string());

    }

}

libs/gui/BufferQueueProducer.cpp

+11 −12
Original line number Diff line number Diff line
@@ -47,23 +47,23 @@ namespace android { 


// Macros for include BufferQueueCore information in log messages

#define BQ_LOGV(x, ...)                                                                           \

    ALOGV("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(),            \

    ALOGV("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(),             \

          mCore->mUniqueId, mCore->mConnectedApi, mCore->mConnectedPid, (mCore->mUniqueId) >> 32, \

          ##__VA_ARGS__)

#define BQ_LOGD(x, ...)                                                                           \

    ALOGD("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(),            \

    ALOGD("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(),             \

          mCore->mUniqueId, mCore->mConnectedApi, mCore->mConnectedPid, (mCore->mUniqueId) >> 32, \

          ##__VA_ARGS__)

#define BQ_LOGI(x, ...)                                                                           \

    ALOGI("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(),            \

    ALOGI("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(),             \

          mCore->mUniqueId, mCore->mConnectedApi, mCore->mConnectedPid, (mCore->mUniqueId) >> 32, \

          ##__VA_ARGS__)

#define BQ_LOGW(x, ...)                                                                           \

    ALOGW("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(),            \

    ALOGW("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(),             \

          mCore->mUniqueId, mCore->mConnectedApi, mCore->mConnectedPid, (mCore->mUniqueId) >> 32, \

          ##__VA_ARGS__)

#define BQ_LOGE(x, ...)                                                                           \

    ALOGE("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(),            \

    ALOGE("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.c_str(),             \

          mCore->mUniqueId, mCore->mConnectedApi, mCore->mConnectedPid, (mCore->mUniqueId) >> 32, \

          ##__VA_ARGS__)
@@ -573,9 +573,9 @@ status_t BufferQueueProducer::dequeueBuffer(int* outSlot, sp<android::Fence>* ou 


    if (returnFlags & BUFFER_NEEDS_REALLOCATION) {

        BQ_LOGV("dequeueBuffer: allocating a new buffer for slot %d", *outSlot);

        sp<GraphicBuffer> graphicBuffer = new GraphicBuffer(

                width, height, format, BQ_LAYER_COUNT, usage,

                {mConsumerName.string(), mConsumerName.size()});

        sp<GraphicBuffer> graphicBuffer =

                new GraphicBuffer(width, height, format, BQ_LAYER_COUNT, usage,

                                  {mConsumerName.c_str(), mConsumerName.size()});



        status_t error = graphicBuffer->initCheck();
@@ -1046,8 +1046,7 @@ status_t BufferQueueProducer::queueBuffer(int slot, 
        output->numPendingBuffers = static_cast<uint32_t>(mCore->mQueue.size());

        output->nextFrameNumber = mCore->mFrameCounter + 1;



        ATRACE_INT(mCore->mConsumerName.string(),

                static_cast<int32_t>(mCore->mQueue.size()));

        ATRACE_INT(mCore->mConsumerName.c_str(), static_cast<int32_t>(mCore->mQueue.size()));

#ifndef NO_BINDER

        mCore->mOccupancyTracker.registerOccupancyChange(mCore->mQueue.size());

#endif
@@ -1487,7 +1486,7 @@ void BufferQueueProducer::allocateBuffers(uint32_t width, uint32_t height, 


            allocFormat = format != 0 ? format : mCore->mDefaultBufferFormat;

            allocUsage = usage | mCore->mConsumerUsageBits;

            allocName.assign(mCore->mConsumerName.string(), mCore->mConsumerName.size());

            allocName.assign(mCore->mConsumerName.c_str(), mCore->mConsumerName.size());



            mCore->mIsAllocating = true;

        } // Autolock scope
@@ -1589,7 +1588,7 @@ status_t BufferQueueProducer::setGenerationNumber(uint32_t generationNumber) { 
String8 BufferQueueProducer::getConsumerName() const {

    ATRACE_CALL();

    std::lock_guard<std::mutex> lock(mCore->mMutex);

    BQ_LOGV("getConsumerName: %s", mConsumerName.string());

    BQ_LOGV("getConsumerName: %s", mConsumerName.c_str());

    return mConsumerName;

}

libs/gui/ConsumerBase.cpp

+10 −8
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ 
#include <utils/Trace.h>



// Macros for including the ConsumerBase name in log messages

#define CB_LOGV(x, ...) ALOGV("[%s] " x, mName.string(), ##__VA_ARGS__)

//#define CB_LOGD(x, ...) ALOGD("[%s] " x, mName.string(), ##__VA_ARGS__)

//#define CB_LOGI(x, ...) ALOGI("[%s] " x, mName.string(), ##__VA_ARGS__)

//#define CB_LOGW(x, ...) ALOGW("[%s] " x, mName.string(), ##__VA_ARGS__)

#define CB_LOGE(x, ...) ALOGE("[%s] " x, mName.string(), ##__VA_ARGS__)

#define CB_LOGV(x, ...) ALOGV("[%s] " x, mName.c_str(), ##__VA_ARGS__)

// #define CB_LOGD(x, ...) ALOGD("[%s] " x, mName.c_str(), ##__VA_ARGS__)

// #define CB_LOGI(x, ...) ALOGI("[%s] " x, mName.c_str(), ##__VA_ARGS__)

// #define CB_LOGW(x, ...) ALOGW("[%s] " x, mName.c_str(), ##__VA_ARGS__)

#define CB_LOGE(x, ...) ALOGE("[%s] " x, mName.c_str(), ##__VA_ARGS__)



namespace android {
@@ -86,8 +86,10 @@ ConsumerBase::~ConsumerBase() { 
    // be done by ConsumerBase::onLastStrongRef(), but it's possible for a

    // derived class to override that method and not call

    // ConsumerBase::onLastStrongRef().

    LOG_ALWAYS_FATAL_IF(!mAbandoned, "[%s] ~ConsumerBase was called, but the "

        "consumer is not abandoned!", mName.string());

    LOG_ALWAYS_FATAL_IF(!mAbandoned,

                        "[%s] ~ConsumerBase was called, but the "

                        "consumer is not abandoned!",

                        mName.c_str());

}



void ConsumerBase::onLastStrongRef(const void* id __attribute__((unused))) {
@@ -451,7 +453,7 @@ status_t ConsumerBase::addReleaseFenceLocked(int slot, 
    // them to get an accurate timestamp.

    if (currentStatus == incomingStatus) {

        char fenceName[32] = {};

        snprintf(fenceName, 32, "%.28s:%d", mName.string(), slot);

        snprintf(fenceName, 32, "%.28s:%d", mName.c_str(), slot);

        sp<Fence> mergedFence = Fence::merge(

                fenceName, mSlots[slot].mFence, fence);

        if (!mergedFence.get()) {