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

Commit 5d484e73 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "lshal: read binder stats from binderfs" am: aa59a8b1 am: f1245932... 

Merge "lshal: read binder stats from binderfs" am: aa59a8b1 am: f1245932 am: 818bf888 am: a6450aba am: 47b8d397

Change-Id: Ic35c322f5b0e7c23436f252ec97f1b355f9bf432
parents 6a0a8ef8 47b8d397

cmds/lshal/ListCommand.cpp

+5 −2
Original line number Diff line number Diff line
@@ -206,10 +206,13 @@ VintfInfo ListCommand::getVintfInfo(const std::string& fqInstanceName, 
static bool scanBinderContext(pid_t pid,

        const std::string &contextName,

        std::function<void(const std::string&)> eachLine) {

    std::ifstream ifs("/d/binder/proc/" + std::to_string(pid));

    std::ifstream ifs("/dev/binderfs/binder_logs/proc/" + std::to_string(pid));

    if (!ifs.is_open()) {

        ifs.open("/d/binder/proc/" + std::to_string(pid));

        if (!ifs.is_open()) {

            return false;

        }

    }



    static const std::regex kContextLine("^context (\\w+)$");

cmds/lshal/ListCommand.h

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ protected: 
    Status fetchBinderizedEntry(const sp<::android::hidl::manager::V1_0::IServiceManager> &manager,

                                TableEntry *entry);



    // Get relevant information for a PID by parsing files under /d/binder.

    // Get relevant information for a PID by parsing files under

    // /dev/binderfs/binder_logs or /d/binder.

    // It is a virtual member function so that it can be mocked.

    virtual bool getPidInfo(pid_t serverPid, PidInfo *info) const;

    // Retrieve from mCachedPidInfos and call getPidInfo if necessary.