ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Attempt process kill even if cgroup is already removed" into main am: b37d7cbef8 am: d5462260cd

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2828279

Change-Id: If8b74bb5db6a6909c5ebd2cb7c9fdddb240fac0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-11-14 21:32:12 +00:00 • committed by Automerger Merge Worker
commit 7998ae5d16
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
init/service.cpp
View file

@ -196,11 +196,12 @@ void Service::NotifyStateChange(const std::string& new_state) const {
}
void Service::KillProcessGroup(int signal) {
// If we've already seen a successful result from killProcessGroup*(), then we have removed
// the cgroup already and calling these functions a second time will simply result in an error.
// This is true regardless of which signal was sent.
// These functions handle their own logging, so no additional logging is needed.
if (!process_cgroup_empty_) {
// Always attempt the process kill if process is still running.
// Cgroup clean up routines are idempotent. It's safe to call
// killProcessGroup repeatedly. During shutdown, `init` will
// call this function to send SIGTERM/SIGKILL to all processes.
// These signals must be sent for a successful shutdown.
if (!process_cgroup_empty_ || IsRunning()) {
LOG(INFO) << "Sending signal " << signal << " to service '" << name_ << "' (pid " << pid_
<< ") process group...";
int r;