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-show: drop 'controller' argument from show_cgroup() and show_cgroup_and_extra()

Browse Source 
Nowadays these always take 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:06:28 +09:00
parent 4365351b93
commit 5169b1c5a7
6 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cgls/cgls.c
View File

@@ -286,7 +286,7 @@ static int run(int argc, char *argv[]) {
show_cg_info(controller, path);
q = show_cgroup(controller, path, NULL, 0, arg_output_flags);
q = show_cgroup(path, NULL, 0, arg_output_flags);
}
failed:
@@ -323,7 +323,7 @@ static int run(int argc, char *argv[]) {
show_cg_info(SYSTEMD_CGROUP_CONTROLLER, root);
printf("-.slice\n");
r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, root, NULL, 0, arg_output_flags);
r = show_cgroup(root, NULL, 0, arg_output_flags);
}
}
if (r < 0)

2
src/login/loginctl.c
View File

@@ -460,7 +460,7 @@ static int show_unit_cgroup(
if (cg_is_empty(SYSTEMD_CGROUP_CONTROLLER, cgroup) != 0 && leader <= 0)
return 0;
show_cgroup_and_extra(SYSTEMD_CGROUP_CONTROLLER, cgroup, prefix, c, &leader, leader > 0, get_output_flags());
show_cgroup_and_extra(cgroup, prefix, c, &leader, leader > 0, get_output_flags());
} else if (r < 0)
return log_error_errno(r, "Failed to dump process list: %s", bus_error_message(&error, r));

2
src/machine/machinectl.c
View File

@@ -455,7 +455,7 @@ static int show_unit_cgroup(
if (cg_is_empty(SYSTEMD_CGROUP_CONTROLLER, cgroup) != 0 && leader <= 0)
return 0;
show_cgroup_and_extra(SYSTEMD_CGROUP_CONTROLLER, cgroup, "\t\t ", c, &leader, leader > 0, get_output_flags());
show_cgroup_and_extra(cgroup, "\t\t ", c, &leader, leader > 0, get_output_flags());
} else if (r < 0)
return log_error_errno(r, "Failed to dump process list: %s", bus_error_message(&error, r));

14
src/shared/cgroup-show.c
View File

@@ -303,17 +303,17 @@ int show_cgroup_by_path(
return 0;
}
int show_cgroup(const char *controller,
const char *path,
int show_cgroup(const char *path,
const char *prefix,
size_t n_columns,
OutputFlags flags) {
_cleanup_free_ char *p = NULL;
int r;
assert(path);
r = cg_get_path(controller, path, NULL, &p);
r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, path, NULL, &p);
if (r < 0)
return r;
@@ -321,7 +321,6 @@ int show_cgroup(const char *controller,
}
static int show_extra_pids(
const char *controller,
const char *path,
const char *prefix,
size_t n_columns,
@@ -350,7 +349,7 @@ static int show_extra_pids(
for (i = 0, j = 0; i < n_pids; i++) {
_cleanup_free_ char *k = NULL;
r = cg_pid_get_path(controller, pids[i], &k);
r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, pids[i], &k);
if (r < 0)
return r;
@@ -366,7 +365,6 @@ static int show_extra_pids(
}
int show_cgroup_and_extra(
const char *controller,
const char *path,
const char *prefix,
size_t n_columns,
@@ -378,11 +376,11 @@ int show_cgroup_and_extra(
assert(path);
r = show_cgroup(controller, path, prefix, n_columns, flags);
r = show_cgroup(path, prefix, n_columns, flags);
if (r < 0)
return r;
return show_extra_pids(controller, path, prefix, n_columns, extra_pids, n_extra_pids, flags);
return show_extra_pids(path, prefix, n_columns, extra_pids, n_extra_pids, flags);
}
int show_cgroup_get_unit_path_and_warn(

11
src/shared/cgroup-show.h
View File

@@ -4,9 +4,14 @@
#include "shared-forward.h"
int show_cgroup_by_path(const char *path, const char *prefix, size_t n_columns, OutputFlags flags);
int show_cgroup(const char *controller, const char *path, const char *prefix, size_t n_columns, OutputFlags flags);
int show_cgroup_and_extra(const char *controller, const char *path, const char *prefix, size_t n_columns, const pid_t extra_pids[], size_t n_extra_pids, OutputFlags flags);
int show_cgroup(const char *path, const char *prefix, size_t n_columns, OutputFlags flags);
int show_cgroup_and_extra(
const char *path,
const char *prefix,
size_t n_columns,
const pid_t extra_pids[],
size_t n_extra_pids,
OutputFlags flags);
int show_cgroup_get_unit_path_and_warn(
sd_bus *bus,

4
src/systemctl/systemctl-show.c
View File

@@ -929,7 +929,7 @@ static void print_status_info(
if (i->control_pid > 0)
extra[k++] = i->control_pid;
show_cgroup_and_extra(SYSTEMD_CGROUP_CONTROLLER, i->control_group, prefix, c, extra, k, get_output_flags());
show_cgroup_and_extra(i->control_group, prefix, c, extra, k, get_output_flags());
} else if (r < 0)
log_warning_errno(r, "Failed to dump process list for '%s', ignoring: %s",
i->id, bus_error_message(&error, r));
@@ -2482,7 +2482,7 @@ static int show_system_status(sd_bus *bus) {
r = unit_show_processes(bus, SPECIAL_ROOT_SLICE, mi.control_group, prefix, c, get_output_flags(), &error);
if (r == -EBADR && arg_transport == BUS_TRANSPORT_LOCAL) /* Compatibility for really old systemd versions */
show_cgroup(SYSTEMD_CGROUP_CONTROLLER, strempty(mi.control_group), prefix, c, get_output_flags());
show_cgroup(strempty(mi.control_group), prefix, c, get_output_flags());
else if (r < 0)
log_warning_errno(r, "Failed to dump process list for '%s', ignoring: %s",
arg_host ?: hn, bus_error_message(&error, r));