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

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

Merge "binder: add tracing for binder proxies" into main am: 91f0294c 

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



Change-Id: Id5c40bf9543ea3da69d0268ed3d268ceadb3aa45
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f1bf8c6 91f0294c

libs/binder/BpBinder.cpp

+10 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#define LOG_TAG "BpBinder"

#define ATRACE_TAG ATRACE_TAG_AIDL

//#define LOG_NDEBUG 0



#include <binder/BpBinder.h>
@@ -26,6 +27,12 @@ 


#include <stdio.h>



#ifndef __TRUSTY__

#include <cutils/trace.h>

#else

#define ATRACE_INT(...)

#endif



#include "BuildFlags.h"

#include "file.h"
@@ -209,6 +216,7 @@ sp<BpBinder> BpBinder::create(int32_t handle) { 
        sTrackingMap[trackedUid]++;

    }

    uint32_t numProxies = sBinderProxyCount.fetch_add(1, std::memory_order_relaxed);

    ATRACE_INT("binder_proxies", numProxies);

    uint32_t numLastWarned = sBinderProxyCountWarned.load(std::memory_order_relaxed);

    uint32_t numNextWarn = numLastWarned + kBinderProxyCountWarnInterval;

    if (numProxies >= numNextWarn) {
@@ -632,8 +640,8 @@ BpBinder::~BpBinder() { 
            }

        }

    }

    --sBinderProxyCount;



    [[maybe_unused]] uint32_t numProxies = --sBinderProxyCount;

    ATRACE_INT("binder_proxies", numProxies);

    if (ipc) {

        ipc->expungeHandle(binderHandle(), this);

        ipc->decWeakHandle(binderHandle());