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

cgroup-util: drop 'controller' argument from cg_enumerate_processes()

Browse Source 
Nowadays it always takes SYSTEMD_CGROUP_CONTROLLER as controller.
Let's drop it.

No functional change, just refactoring.
This commit is contained in:
Yu Watanabe
2025-08-30 05:18:55 +09:00
parent 5169b1c5a7
commit f8de2107a7
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,14 +130,14 @@ int cg_get_cgroupid_at(int dfd, const char *path, uint64_t *ret) {
return 0;
}
int cg_enumerate_processes(const char *controller, const char *path, FILE **ret) {
int cg_enumerate_processes(const char *path, FILE **ret) {
_cleanup_free_ char *fs = NULL;
FILE *f;
int r;
assert(ret);
r = cg_get_path(controller, path, "cgroup.procs", &fs);
r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, path, "cgroup.procs", &fs);
if (r < 0)
return r;
@@ -308,7 +308,7 @@ int cg_kill(
done = true;
r = cg_enumerate_processes(SYSTEMD_CGROUP_CONTROLLER, path, &f);
r = cg_enumerate_processes(path, &f);
if (r == -ENOENT)
break;
if (r < 0)

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

@@ -155,7 +155,7 @@ typedef enum CGroupFlags {
CGROUP_DONT_SKIP_UNMAPPED = 1 << 2,
} CGroupFlags;
int cg_enumerate_processes(const char *controller, const char *path, FILE **ret);
int cg_enumerate_processes(const char *path, FILE **ret);
int cg_read_pid(FILE *f, pid_t *ret, CGroupFlags flags);
int cg_read_pidref(FILE *f, PidRef *ret, CGroupFlags flags);

2
src/cgtop/cgtop.c
View File

@@ -367,7 +367,7 @@ static int process(
_cleanup_fclose_ FILE *f = NULL;
pid_t pid;
r = cg_enumerate_processes(SYSTEMD_CGROUP_CONTROLLER, path, &f);
r = cg_enumerate_processes(path, &f);
if (r < 0 && r != -ENOENT)
return r;
if (r >= 0) {

2
src/core/cgroup.c
View File

@@ -2857,7 +2857,7 @@ int unit_search_main_pid(Unit *u, PidRef *ret) {
if (!crt || !crt->cgroup_path)
return -ENXIO;
r = cg_enumerate_processes(SYSTEMD_CGROUP_CONTROLLER, crt->cgroup_path, &f);
r = cg_enumerate_processes(crt->cgroup_path, &f);
if (r < 0)
return r;

2
src/core/dbus-unit.c
View File

@@ -1375,7 +1375,7 @@ static int append_cgroup(sd_bus_message *reply, const char *p, Set *pids) {
assert(reply);
assert(p);
r = cg_enumerate_processes(SYSTEMD_CGROUP_CONTROLLER, p, &f);
r = cg_enumerate_processes(p, &f);
if (r == -ENOENT)
return 0;
if (r < 0)

2
src/shared/cgroup-setup.c
View File

@@ -334,7 +334,7 @@ int cg_migrate(
done = true;
r = cg_enumerate_processes(SYSTEMD_CGROUP_CONTROLLER, from, &f);
r = cg_enumerate_processes(from, &f);
if (r < 0)
return RET_GATHER(ret, r);