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

Commit fb7b7a4d authored by Martijn Coenen's avatar Martijn Coenen Committed by Automerger Merge Worker
Browse files

Merge "Log outgoing transactions/replies over 300kB." am: 8be03870 am:... 

Merge "Log outgoing transactions/replies over 300kB." am: 8be03870 am: 0030d672 am: 7f0cd40d am: 0ab3b553

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

Change-Id: I0b87b40aa29b53dee92834fa9a417f7953e2ca1f
parents d2afdfcb 0ab3b553

libs/binder/Binder.cpp

+6 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ constexpr const bool kEnableRpcDevServers = true; 
constexpr const bool kEnableRpcDevServers = false;

#endif



// Log any reply transactions for which the data exceeds this size

#define LOG_REPLIES_OVER_SIZE (300 * 1024)

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



IBinder::IBinder()
@@ -296,6 +298,10 @@ status_t BBinder::transact( 
    // In case this is being transacted on in the same process.

    if (reply != nullptr) {

        reply->setDataPosition(0);

        if (reply->dataSize() > LOG_REPLIES_OVER_SIZE) {

            ALOGW("Large reply transaction of %zu bytes, interface descriptor %s, code %d",

                  reply->dataSize(), String8(getInterfaceDescriptor()).c_str(), code);

        }

    }



    return err;

libs/binder/BpBinder.cpp

+11 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ uint32_t BpBinder::sBinderProxyCountHighWatermark = 2500; 
// Another arbitrary value a binder count needs to drop below before another callback will be called

uint32_t BpBinder::sBinderProxyCountLowWatermark = 2000;



// Log any transactions for which the data exceeds this size

#define LOG_TRANSACTIONS_OVER_SIZE (300 * 1024)



enum {

    LIMIT_REACHED_MASK = 0x80000000,        // A flag denoting that the limit has been reached

    COUNTING_VALUE_MASK = 0x7FFFFFFF,       // A mask of the remaining bits for the count value
@@ -302,6 +305,14 @@ status_t BpBinder::transact( 
        } else {

            status = IPCThreadState::self()->transact(binderHandle(), code, data, reply, flags);

        }

        if (data.dataSize() > LOG_TRANSACTIONS_OVER_SIZE) {

            Mutex::Autolock _l(mLock);

            ALOGW("Large outgoing transaction of %zu bytes, interface descriptor %s, code %d",

                  data.dataSize(),

                  mDescriptorCache.size() ? String8(mDescriptorCache).c_str()

                                          : "<uncached descriptor>",

                  code);

        }



        if (status == DEAD_OBJECT) mAlive = 0;