Merge "Kill its process group even if the given process is already dead" (763593e3) · Commits · e / os / android_system_core

libprocessgroup/processgroup.cpp

+9 −12

Original line number	Diff line number	Diff line
		@@ -406,11 +406,7 @@ static int DoKillProcessGroupOnce(const char* cgroup, uid_t uid, int initialPid,
		pids.emplace(pid);
		}
		}
		if (file_is_empty) {
		// This happens when process is already dead
		return 0;
		}

		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);
		@@ -421,6 +417,7 @@ static int DoKillProcessGroupOnce(const char* cgroup, uid_t uid, int initialPid,
		}
		}
		}
		}

		int processes = 0;
		// Kill all process groups.