commit 93dd933d858ec0412364991ea38e6d18783adac8
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 11 20:24:49 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 11 20:24:49 2021 +0000
tree 040915352224995078f95ff15e2ce835fa2f6d2c
parent 297b23837eeff05d82b6dfdee6672dfc2d8cf1b0
parent c78ae6008713ab2a1d64d0831ac9e139ed49ae10

Merge "Show names of processes killed by KillProcessesWithOpenFiles()"

Process.cpp

diff --git a/Process.cpp b/Process.cpp
index 79fe15d..c1d55ee 100644
--- a/Process.cpp
+++ b/Process.cpp
@@ -175,7 +175,15 @@
     }
     if (signal != 0) {
         for (const auto& pid : pids) {
-            LOG(WARNING) << "Sending " << strsignal(signal) << " to " << pid;
+            std::string comm;
+            android::base::ReadFileToString(StringPrintf("/proc/%d/comm", pid), &comm);
+            comm = android::base::Trim(comm);
+
+            std::string exe;
+            android::base::Readlink(StringPrintf("/proc/%d/exe", pid), &exe);
+
+            LOG(WARNING) << "Sending " << strsignal(signal) << " to pid " << pid << " (" << comm
+                         << ", " << exe << ")";
             kill(pid, signal);
         }
     }