cgroup-show: drop 'controller' argument from show_cgroup() and show_cgroup_and_extra()

Nowadays these always take SYSTEMD_CGROUP_CONTROLLER as controller.
Let's drop it.

No functional change, just refactoring.

diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index 9e023af0312a4dfc7709b3585fdb70cede6008c0..339f7d5ce4f3c7fd64c93cb8bb3ace9f14f87552 100644 (file)
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -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)

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index c86f694c2baf6f5890e614b8b45b53447838cee0..1a5cbb45e1cbcfd120fced2961cbe46259e907a5 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -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));
 

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 487a50813ef0f75426d2e38f4da5599948497f1d..1318f3c6f24616a11719ff6ac29f8b1a92322e8a 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -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));
 

diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c
index b97edbdba77dcaaf6776babd0a37b835cee97fe5..e60cfec854f030e2ccf9919edd323302d080e421 100644 (file)
--- a/src/shared/cgroup-show.c
+++ b/src/shared/cgroup-show.c
@@ -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(

diff --git a/src/shared/cgroup-show.h b/src/shared/cgroup-show.h
index ecff0298ae515e5dfb16bd70dd935272afe87c69..27fc878c93c996e642cc1559f50fa2ae8a452c9f 100644 (file)
--- a/src/shared/cgroup-show.h
+++ b/src/shared/cgroup-show.h
@@ -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,

diff --git a/src/systemctl/systemctl-show.c b/src/systemctl/systemctl-show.c
index 2e7d3ffe75341908bdd20cfaf4a16791dbd126dd..97137ef170c564a0f8c22b0295974aa23653436c 100644 (file)
--- a/src/systemctl/systemctl-show.c
+++ b/src/systemctl/systemctl-show.c
@@ -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));