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

Commit 430193f3 authored by Iris Chang's avatar Iris Chang Committed by Marissa Wall
Browse files

libgui: add more information when print BQ log and dump 

Logs are only debug pupose,
BQ_LOG prefix define: When any BQ log appears with same consumer name,
it needs more information about BqId, pid to determine whether BQ
destoryed and recreate.
Dump log: Add more information in dump log to check if the behavior of
BQ fulfill the requirement

Bug: 145881374
Test: Manual tesing with 'launch and leave arbitrary activiy' and enbale
print Verbose log.
Test: Manual tesing with 'dumpsys SurfaceFlinger'

Change-Id: I9352336df009fb3f26e2549f14feb8f21bad8a52
parent f4169dd8

libs/gui/BufferQueueConsumer.cpp

+22 −0
Original line number Diff line number Diff line
@@ -44,6 +44,28 @@ 


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(),            \

          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(),            \

          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(),            \

          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(),            \

          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(),            \

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

          ##__VA_ARGS__)



BufferQueueConsumer::BufferQueueConsumer(const sp<BufferQueueCore>& core) :

    mCore(core),

    mSlots(core->mSlots),

libs/gui/BufferQueueCore.cpp

+44 −0
Original line number Diff line number Diff line
@@ -42,6 +42,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(), 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, \

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

#define BQ_LOGI(x, ...)                                                                           \

    ALOGI("[%s](id:%" PRIx64 ",api:%d,p:%d,c:%" PRIu64 ") " x, mConsumerName.string(), 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, \

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

#define BQ_LOGE(x, ...)                                                                           \

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

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



static String8 getUniqueName() {

    static volatile int32_t counter = 0;

    return String8::format("unnamed-%d-%d", getpid(),
@@ -54,6 +71,19 @@ static uint64_t getUniqueId() { 
    return id | counter++;

}



static status_t getProcessName(int pid, String8& name) {

    FILE* fp = fopen(String8::format("/proc/%d/cmdline", pid), "r");

    if (NULL != fp) {

        const size_t size = 64;

        char proc_name[size];

        fgets(proc_name, size, fp);

        fclose(fp);

        name = proc_name;

        return NO_ERROR;

    }

    return INVALID_OPERATION;

}



BufferQueueCore::BufferQueueCore() :

    mMutex(),

    mIsAbandoned(false),
@@ -132,6 +162,20 @@ void BufferQueueCore::dumpState(const String8& prefix, String8* outResult) const 
                            mTransformHintInUse, mAutoPrerotation);



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



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



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

                            mConsumerUsageBits);



    String8 producerProcName = String8("\?\?\?");

    String8 consumerProcName = String8("\?\?\?");

    int32_t pid = getpid();

    getProcessName(mConnectedPid, producerProcName);

    getProcessName(pid, consumerProcName);

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

                            mConnectedPid, producerProcName.string(), pid,

                            consumerProcName.string());

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

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

        double timestamp = current->mTimestamp / 1e9;

libs/gui/BufferQueueProducer.cpp

+22 −0
Original line number Diff line number Diff line
@@ -44,6 +44,28 @@ 


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(),            \

          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(),            \

          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(),            \

          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(),            \

          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(),            \

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

          ##__VA_ARGS__)



static constexpr uint32_t BQ_LAYER_COUNT = 1;



BufferQueueProducer::BufferQueueProducer(const sp<BufferQueueCore>& core,

libs/gui/include/gui/BufferQueueCore.h

+0 −6
Original line number Diff line number Diff line
@@ -34,12 +34,6 @@ 
#include <mutex>

#include <condition_variable>



#define BQ_LOGV(x, ...) ALOGV("[%s] " x, mConsumerName.string(), ##__VA_ARGS__)

#define BQ_LOGD(x, ...) ALOGD("[%s] " x, mConsumerName.string(), ##__VA_ARGS__)

#define BQ_LOGI(x, ...) ALOGI("[%s] " x, mConsumerName.string(), ##__VA_ARGS__)

#define BQ_LOGW(x, ...) ALOGW("[%s] " x, mConsumerName.string(), ##__VA_ARGS__)

#define BQ_LOGE(x, ...) ALOGE("[%s] " x, mConsumerName.string(), ##__VA_ARGS__)



#define ATRACE_BUFFER_INDEX(index)                                                         \

    do {                                                                                   \

        if (ATRACE_ENABLED()) {                                                            \