SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared/cgroup-show: extract funtion to query unit cgroup path

Browse Source 
…and use it where possible.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2017-02-01 20:31:50 -05:00
parent d3e8277d50
commit bc06be7533
5 changed files with 43 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cgls/cgls.c
-1
View File
@@ -26,7 +26,6 @@
#include "sd-bus.h"
#include "alloc-util.h"
#include "bus-error.h"
#include "bus-util.h"
#include "cgroup-show.h"
#include "cgroup-util.h"
src/login/loginctl.c
+3 -22
View File
@@ -240,7 +240,6 @@ static int list_seats(int argc, char *argv[], void *userdata) {
sd_bus *bus = userdata;
unsigned k = 0;
int r;
assert(bus);
assert(argv);
@@ -280,35 +279,17 @@ static int list_seats(int argc, char *argv[], void *userdata) {
}
static int show_unit_cgroup(sd_bus *bus, const char *interface, const char *unit, pid_t leader) {
_cleanup_free_ char *cgroup = NULL;
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_free_ char *path = NULL;
const char *cgroup;
unsigned c;
int r;
assert(bus);
assert(unit);
path = unit_dbus_path_from_name(unit);
if (!path)
return log_oom();
r = sd_bus_get_property(
bus,
"org.freedesktop.systemd1",
path,
interface,
"ControlGroup",
&error,
&reply,
"s");
r = show_cgroup_get_unit_path_and_warn(bus, unit, &cgroup);
if (r < 0)
return log_error_errno(r, "Failed to query ControlGroup: %s", bus_error_message(&error, r));
r = sd_bus_message_read(reply, "s", &cgroup);
if (r < 0)
return bus_log_parse_error(r);
return r;
if (isempty(cgroup))
return 0;
src/machine/machinectl.c
+3 -21
View File
@@ -477,35 +477,17 @@ static int list_images(int argc, char *argv[], void *userdata) {
}
static int show_unit_cgroup(sd_bus *bus, const char *unit, pid_t leader) {
_cleanup_free_ char *cgroup = NULL;
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_free_ char *path = NULL;
const char *cgroup;
int r;
unsigned c;
assert(bus);
assert(unit);
path = unit_dbus_path_from_name(unit);
if (!path)
return log_oom();
r = sd_bus_get_property(
bus,
"org.freedesktop.systemd1",
path,
unit_dbus_interface_from_name(unit),
"ControlGroup",
&error,
&reply,
"s");
r = show_cgroup_get_unit_path_and_warn(bus, unit, &cgroup);
if (r < 0)
return log_error_errno(r, "Failed to query ControlGroup: %s", bus_error_message(&error, r));
r = sd_bus_message_read(reply, "s", &cgroup);
if (r < 0)
return bus_log_parse_error(r);
return r;
if (isempty(cgroup))
return 0;
src/shared/cgroup-show.c
+31 -16
View File
@@ -317,6 +317,34 @@ int show_cgroup_and_extra_by_spec(
return show_cgroup_and_extra(controller, path, prefix, n_columns, extra_pids, n_extra_pids, flags);
}
int show_cgroup_get_unit_path_and_warn(
sd_bus *bus,
const char *unit,
char **ret) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_free_ char *path = NULL;
int r;
path = unit_dbus_path_from_name(unit);
if (!path)
return log_oom();
r = sd_bus_get_property_string(
bus,
"org.freedesktop.systemd1",
path,
unit_dbus_interface_from_name(unit),
"ControlGroup",
&error,
ret);
if (r < 0)
return log_error_errno(r, "Failed to query unit control group path: %s",
bus_error_message(&error, r));
return 0;
}
int show_cgroup_get_path_and_warn(
const char *machine,
const char *prefix,
@@ -326,9 +354,8 @@ int show_cgroup_get_path_and_warn(
_cleanup_free_ char *root = NULL;
if (machine) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
_cleanup_free_ char *unit = NULL, *path = NULL;
_cleanup_free_ char *unit = NULL;
const char *m;
m = strjoina("/run/systemd/machines/", machine);
@@ -336,25 +363,13 @@ int show_cgroup_get_path_and_warn(
if (r < 0)
return log_error_errno(r, "Failed to load machine data: %m");
path = unit_dbus_path_from_name(unit);
if (!path)
return log_oom();
r = bus_connect_transport_systemd(BUS_TRANSPORT_LOCAL, NULL, false, &bus);
if (r < 0)
return log_error_errno(r, "Failed to create bus connection: %m");
r = sd_bus_get_property_string(
bus,
"org.freedesktop.systemd1",
path,
unit_dbus_interface_from_name(unit),
"ControlGroup",
&error,
&root);
r = show_cgroup_get_unit_path_and_warn(bus, unit, &root);
if (r < 0)
return log_error_errno(r, "Failed to query unit control group path: %s",
bus_error_message(&error, r));
return r;
} else {
r = cg_get_root_path(&root);
if (r == -ENOMEDIUM)
src/shared/cgroup-show.h
+6
View File
@@ -22,6 +22,8 @@
#include <stdbool.h>
#include <sys/types.h>
#include <systemd/sd-bus.h>
#include "logs-show.h"
#include "output-mode.h"
@@ -31,6 +33,10 @@ int show_cgroup(const char *controller, const char *path, const char *prefix, un
int show_cgroup_and_extra_by_spec(const char *spec, const char *prefix, unsigned n_columns, const pid_t extra_pids[], unsigned n_extra_pids, OutputFlags flags);
int show_cgroup_and_extra(const char *controller, const char *path, const char *prefix, unsigned n_columns, const pid_t extra_pids[], unsigned n_extra_pids, OutputFlags flags);
int show_cgroup_get_unit_path_and_warn(
sd_bus *bus,
const char *unit,
char **ret);
int show_cgroup_get_path_and_warn(
const char *machine,
const char *prefix,