diff options
| author | 2020-02-26 07:18:43 +0000 | |
|---|---|---|
| committer | 2020-02-26 07:18:43 +0000 | |
| commit | aa59a8b100c30c20e50a9cedd04d76b3610f0de3 (patch) | |
| tree | b7eed0f7befccca1e676c877ad78d42bdd5f6ab8 | |
| parent | ab0b2a284eedf9b696edc7770efcc37d2cffcfa7 (diff) | |
| parent | b49b0b162fd17f92ff01292cd9a3595fe706f9ae (diff) | |
Merge "lshal: read binder stats from binderfs"
| -rw-r--r-- | cmds/lshal/ListCommand.cpp | 7 | ||||
| -rw-r--r-- | cmds/lshal/ListCommand.h | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/cmds/lshal/ListCommand.cpp b/cmds/lshal/ListCommand.cpp index a7ccf64c50..f426dbbc4f 100644 --- a/cmds/lshal/ListCommand.cpp +++ b/cmds/lshal/ListCommand.cpp @@ -206,9 +206,12 @@ 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()) { - return false; + ifs.open("/d/binder/proc/" + std::to_string(pid)); + if (!ifs.is_open()) { + return false; + } } static const std::regex kContextLine("^context (\\w+)$"); diff --git a/cmds/lshal/ListCommand.h b/cmds/lshal/ListCommand.h index b3ed23d1fc..acc0dcfc2e 100644 --- a/cmds/lshal/ListCommand.h +++ b/cmds/lshal/ListCommand.h @@ -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. |