forked from pool/systemd
138 lines
6.0 KiB
Diff
138 lines
6.0 KiB
Diff
From cdc06ed7b6120c1049305fa7033f228ee9d86043 Mon Sep 17 00:00:00 2001
|
|
From: David Strauss <david@davidstrauss.net>
|
|
Date: Mon, 28 Apr 2014 12:08:32 -0700
|
|
Subject: [PATCH] core: Filter by state behind the D-Bus API, not in the
|
|
systemctl client.
|
|
|
|
---
|
|
src/core/dbus-manager.c | 24 +++++++++++++++++++++++-
|
|
src/core/org.freedesktop.systemd1.conf | 4 ++++
|
|
src/systemctl/systemctl.c | 24 +++++++++++++-----------
|
|
3 files changed, 40 insertions(+), 12 deletions(-)
|
|
|
|
diff --git src/core/dbus-manager.c src/core/dbus-manager.c
|
|
index 58e484d..d5fab0a 100644
|
|
--- src/core/dbus-manager.c
|
|
+++ src/core/dbus-manager.c
|
|
@@ -728,7 +728,7 @@ static int method_reset_failed(sd_bus *bus, sd_bus_message *message, void *userd
|
|
return sd_bus_reply_method_return(message, NULL);
|
|
}
|
|
|
|
-static int method_list_units(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
|
|
+static int list_units_filtered(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error, char **states) {
|
|
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
|
|
Manager *m = userdata;
|
|
const char *k;
|
|
@@ -761,6 +761,12 @@ static int method_list_units(sd_bus *bus, sd_bus_message *message, void *userdat
|
|
|
|
following = unit_following(u);
|
|
|
|
+ if (!strv_isempty(states) &&
|
|
+ !strv_contains(states, unit_load_state_to_string(u->load_state)) &&
|
|
+ !strv_contains(states, unit_active_state_to_string(unit_active_state(u))) &&
|
|
+ !strv_contains(states, unit_sub_state_to_string(u)))
|
|
+ continue;
|
|
+
|
|
unit_path = unit_dbus_path(u);
|
|
if (!unit_path)
|
|
return -ENOMEM;
|
|
@@ -794,6 +800,21 @@ static int method_list_units(sd_bus *bus, sd_bus_message *message, void *userdat
|
|
return sd_bus_send(bus, reply, NULL);
|
|
}
|
|
|
|
+static int method_list_units(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
|
|
+ return list_units_filtered(bus, message, userdata, error, NULL);
|
|
+}
|
|
+
|
|
+static int method_list_units_filtered(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
|
|
+ _cleanup_strv_free_ char **states = NULL;
|
|
+ int r;
|
|
+
|
|
+ r = sd_bus_message_read_strv(message, &states);
|
|
+ if (r < 0)
|
|
+ return r;
|
|
+
|
|
+ return list_units_filtered(bus, message, userdata, error, states);
|
|
+}
|
|
+
|
|
static int method_list_jobs(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
|
|
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
|
|
Manager *m = userdata;
|
|
@@ -1670,6 +1691,7 @@ const sd_bus_vtable bus_manager_vtable[] = {
|
|
SD_BUS_METHOD("ClearJobs", NULL, NULL, method_clear_jobs, 0),
|
|
SD_BUS_METHOD("ResetFailed", NULL, NULL, method_reset_failed, 0),
|
|
SD_BUS_METHOD("ListUnits", NULL, "a(ssssssouso)", method_list_units, SD_BUS_VTABLE_UNPRIVILEGED),
|
|
+ SD_BUS_METHOD("ListUnitsFiltered", "as", "a(ssssssouso)", method_list_units_filtered, SD_BUS_VTABLE_UNPRIVILEGED),
|
|
SD_BUS_METHOD("ListJobs", NULL, "a(usssoo)", method_list_jobs, SD_BUS_VTABLE_UNPRIVILEGED),
|
|
SD_BUS_METHOD("Subscribe", NULL, NULL, method_subscribe, SD_BUS_VTABLE_UNPRIVILEGED),
|
|
SD_BUS_METHOD("Unsubscribe", NULL, NULL, method_unsubscribe, SD_BUS_VTABLE_UNPRIVILEGED),
|
|
diff --git src/core/org.freedesktop.systemd1.conf src/core/org.freedesktop.systemd1.conf
|
|
index a375dce..9dfca81 100644
|
|
--- src/core/org.freedesktop.systemd1.conf
|
|
+++ src/core/org.freedesktop.systemd1.conf
|
|
@@ -64,6 +64,10 @@
|
|
|
|
<allow send_destination="org.freedesktop.systemd1"
|
|
send_interface="org.freedesktop.systemd1.Manager"
|
|
+ send_member="ListUnitsFiltered"/>
|
|
+
|
|
+ <allow send_destination="org.freedesktop.systemd1"
|
|
+ send_interface="org.freedesktop.systemd1.Manager"
|
|
send_member="ListUnitFiles"/>
|
|
|
|
<allow send_destination="org.freedesktop.systemd1"
|
|
--- src/systemctl/systemctl.c
|
|
+++ src/systemctl/systemctl.c 2014-05-20 12:39:27.058236843 +0000
|
|
@@ -308,12 +308,6 @@ static int compare_unit_info(const void
|
|
static bool output_show_unit(const UnitInfo *u, char **patterns) {
|
|
const char *dot;
|
|
|
|
- if (!strv_isempty(arg_states))
|
|
- return
|
|
- strv_contains(arg_states, u->load_state) ||
|
|
- strv_contains(arg_states, u->sub_state) ||
|
|
- strv_contains(arg_states, u->active_state);
|
|
-
|
|
if (!strv_isempty(patterns)) {
|
|
char **pattern;
|
|
|
|
@@ -467,6 +461,7 @@ static int get_unit_list(
|
|
UnitInfo **_unit_infos,
|
|
char **patterns) {
|
|
|
|
+ _cleanup_bus_message_unref_ sd_bus_message *m = NULL;
|
|
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
|
|
_cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
|
|
_cleanup_free_ UnitInfo *unit_infos = NULL;
|
|
@@ -478,15 +473,22 @@ static int get_unit_list(
|
|
assert(_reply);
|
|
assert(_unit_infos);
|
|
|
|
- r = sd_bus_call_method(
|
|
+ r = sd_bus_message_new_method_call(
|
|
bus,
|
|
+ &m,
|
|
"org.freedesktop.systemd1",
|
|
"/org/freedesktop/systemd1",
|
|
"org.freedesktop.systemd1.Manager",
|
|
- "ListUnits",
|
|
- &error,
|
|
- &reply,
|
|
- NULL);
|
|
+ "ListUnitsFiltered");
|
|
+
|
|
+ if (r < 0)
|
|
+ return bus_log_create_error(r);
|
|
+
|
|
+ r = sd_bus_message_append_strv(m, arg_states);
|
|
+ if (r < 0)
|
|
+ return bus_log_create_error(r);
|
|
+
|
|
+ r = sd_bus_call(bus, m, 0, &error, &reply);
|
|
if (r < 0) {
|
|
log_error("Failed to list units: %s", bus_error_message(&error, r));
|
|
return r;
|
|
--
|
|
1.7.9.2
|
|
|