morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

cgroup-util: rename 's' -> 'killed_pids'

Browse Source
This commit is contained in:
Jelle van der Waa
2025-05-21 20:04:55 +02:00
parent 457ce7d94a
commit 684cd01f0e
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/basic/cgroup-util.c
View File

@@ -292,7 +292,7 @@ int cg_kill(
const char *path,
int sig,
CGroupFlags flags,
Set *s,
Set *killed_pids,
cg_kill_log_func_t log_kill,
void *userdata) {
@@ -312,9 +312,9 @@ int cg_kill(
*
* When sending SIGKILL, prefer cg_kill_kernel_sigkill(), which is fully atomic. */
if (!s) {
s = allocated_set = set_new(NULL);
if (!s)
if (!killed_pids) {
killed_pids = allocated_set = set_new(NULL);
if (!killed_pids)
return -ENOMEM;
}
@@ -343,7 +343,7 @@ int cg_kill(
if ((flags & CGROUP_IGNORE_SELF) && pidref_is_self(&pidref))
continue;
if (set_contains(s, PID_TO_PTR(pidref.pid)))
if (set_contains(killed_pids, PID_TO_PTR(pidref.pid)))
continue;
/* Ignore kernel threads to mimic the behavior of cgroup.kill. */
@@ -373,7 +373,7 @@ int cg_kill(
done = false;
r = set_put(s, PID_TO_PTR(pidref.pid));
r = set_put(killed_pids, PID_TO_PTR(pidref.pid));
if (r < 0)
return RET_GATHER(ret, r);
}
@@ -390,7 +390,7 @@ int cg_kill_recursive(
const char *path,
int sig,
CGroupFlags flags,
Set *s,
Set *killed_pids,
cg_kill_log_func_t log_kill,
void *userdata) {
@@ -401,13 +401,13 @@ int cg_kill_recursive(
assert(path);
assert(sig >= 0);
if (!s) {
s = allocated_set = set_new(NULL);
if (!s)
if (!killed_pids) {
killed_pids = allocated_set = set_new(NULL);
if (!killed_pids)
return -ENOMEM;
}
ret = cg_kill(path, sig, flags, s, log_kill, userdata);
ret = cg_kill(path, sig, flags, killed_pids, log_kill, userdata);
r = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, path, &d);
if (r < 0) {
@@ -432,7 +432,7 @@ int cg_kill_recursive(
if (!p)
return -ENOMEM;
r = cg_kill_recursive(p, sig, flags, s, log_kill, userdata);
r = cg_kill_recursive(p, sig, flags, killed_pids, log_kill, userdata);
if (r < 0)
log_debug_errno(r, "Failed to recursively kill processes in cgroup '%s': %m", p);
if (r != 0 && ret >= 0)

4
src/basic/cgroup-util.h
View File

@@ -206,9 +206,9 @@ int cg_read_subgroup(DIR *d, char **ret);
typedef int (*cg_kill_log_func_t)(const PidRef *pid, int sig, void *userdata);
int cg_kill(const char *path, int sig, CGroupFlags flags, Set *s, cg_kill_log_func_t kill_log, void *userdata);
int cg_kill(const char *path, int sig, CGroupFlags flags, Set *killed_pids, cg_kill_log_func_t kill_log, void *userdata);
int cg_kill_kernel_sigkill(const char *path);
int cg_kill_recursive(const char *path, int sig, CGroupFlags flags, Set *s, cg_kill_log_func_t kill_log, void *userdata);
int cg_kill_recursive(const char *path, int sig, CGroupFlags flags, Set *killed_pids, cg_kill_log_func_t kill_log, void *userdata);
int cg_split_spec(const char *spec, char **ret_controller, char **ret_path);
int cg_mangle_path(const char *path, char **ret);

2
src/core/unit.c
View File

@@ -6008,7 +6008,7 @@ int unit_warn_leftover_processes(Unit *u, bool start) {
crt->cgroup_path,
/* sig= */ 0,
/* flags= */ 0,
/* set= */ NULL,
/* killed_pids= */ NULL,
start ? unit_log_leftover_process_start : unit_log_leftover_process_stop,
u);
}

2
src/udev/udev-manager.c
View File

@@ -1321,7 +1321,7 @@ static int on_post(sd_event_source *s, void *userdata) {
if (manager->cgroup && set_isempty(manager->synthesize_change_child_event_sources))
/* cleanup possible left-over processes in our cgroup */
(void) cg_kill(manager->cgroup, SIGKILL, CGROUP_IGNORE_SELF, /* set=*/ NULL, /* kill_log= */ NULL, /* userdata= */ NULL);
(void) cg_kill(manager->cgroup, SIGKILL, CGROUP_IGNORE_SELF, /* killed_pids=*/ NULL, /* kill_log= */ NULL, /* userdata= */ NULL);
return 0;
}