commit 007769a0d7c006f15896718ff6e750cfa5e7e308
author Steven Moreland <smoreland@google.com> Tue Feb 28 19:07:41 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 28 19:07:41 2023 +0000
tree 1001f7b0df92fa49897e66fdc1aa1e3e0a5505a6
parent 763593e395419f5ea3ee229801d9173ec9d4d8a3
parent 8e25d9c5b0120ac24da329b91ca5b4a6a3090685

Merge "init: add log w/ service PID"

libprocessgroup/processgroup.cpp

diff --git a/libprocessgroup/processgroup.cpp b/libprocessgroup/processgroup.cpp
index 1da69ba..384a8f0 100644
--- a/libprocessgroup/processgroup.cpp
+++ b/libprocessgroup/processgroup.cpp
@@ -406,18 +406,15 @@
                 pids.emplace(pid);
             }
         }
-        if (file_is_empty) {
-            // This happens when process is already dead
-            return 0;
-        }
-
-        // Erase all pids that will be killed when we kill the process groups.
-        for (auto it = pids.begin(); it != pids.end();) {
-            pid_t pgid = getpgid(*it);
-            if (pgids.count(pgid) == 1) {
-                it = pids.erase(it);
-            } else {
-                ++it;
+        if (!file_is_empty) {
+            // Erase all pids that will be killed when we kill the process groups.
+            for (auto it = pids.begin(); it != pids.end();) {
+                pid_t pgid = getpgid(*it);
+                if (pgids.count(pgid) == 1) {
+                    it = pids.erase(it);
+                } else {
+                    ++it;
+                }
             }
         }
     }