X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fdbus-scope.c;h=13ff49d62f47943d1052d31ac4a1843b132efe64;hp=30b9c00335bb740ed1f29a7102008473c110ab99;hb=d003f514dab2dbf1a66e11800a50aeaf039d036c;hpb=d7550a6752be85f98408a86b7ae23a033e9b2983
diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c
index 30b9c0033..13ff49d62 100644
--- a/src/core/dbus-scope.c
+++ b/src/core/dbus-scope.c
@@ -19,109 +19,93 @@
along with systemd; If not, see .
***/
-#include
-
+#include "unit.h"
+#include "scope.h"
#include "dbus-unit.h"
-#include "dbus-common.h"
#include "dbus-cgroup.h"
#include "dbus-kill.h"
-#include "selinux-access.h"
#include "dbus-scope.h"
+#include "bus-util.h"
-#define BUS_SCOPE_INTERFACE \
- " \n" \
- BUS_UNIT_CGROUP_INTERFACE \
- " \n" \
- BUS_KILL_CONTEXT_INTERFACE \
- BUS_CGROUP_CONTEXT_INTERFACE \
- " \n" \
- " \n"
-
-#define INTROSPECTION \
- DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \
- "\n" \
- BUS_UNIT_INTERFACE \
- BUS_SCOPE_INTERFACE \
- BUS_PROPERTIES_INTERFACE \
- BUS_PEER_INTERFACE \
- BUS_INTROSPECTABLE_INTERFACE \
- "\n"
-
-#define INTERFACES_LIST \
- BUS_UNIT_INTERFACES_LIST \
- "org.freedesktop.systemd1.Scope\0"
-
-const char bus_scope_interface[] _introspect_("Scope") = BUS_SCOPE_INTERFACE;
-
-static DEFINE_BUS_PROPERTY_APPEND_ENUM(bus_scope_append_scope_result, scope_result, ScopeResult);
-
-static const BusProperty bus_scope_properties[] = {
- { "TimeoutStopUSec", bus_property_append_usec, "t", offsetof(Scope, timeout_stop_usec) },
- { "Result", bus_scope_append_scope_result, "s", offsetof(Scope, result) },
- {}
-};
-
-DBusHandlerResult bus_scope_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
- Scope *s = SCOPE(u);
-
- const BusBoundProperties bps[] = {
- { "org.freedesktop.systemd1.Unit", bus_unit_properties, u },
- { "org.freedesktop.systemd1.Scope", bus_unit_cgroup_properties, u },
- { "org.freedesktop.systemd1.Scope", bus_scope_properties, s },
- { "org.freedesktop.systemd1.Scope", bus_cgroup_context_properties, &s->cgroup_context },
- { "org.freedesktop.systemd1.Scope", bus_kill_context_properties, &s->kill_context },
- {}
- };
+static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, scope_result, ScopeResult);
- SELINUX_UNIT_ACCESS_CHECK(u, c, message, "status");
+const sd_bus_vtable bus_scope_vtable[] = {
+ SD_BUS_VTABLE_START(0),
+ SD_BUS_PROPERTY("TimeoutStopUSec", "t", bus_property_get_usec, offsetof(Scope, timeout_stop_usec), 0),
+ SD_BUS_PROPERTY("Result", "s", property_get_result, offsetof(Scope, result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+ SD_BUS_VTABLE_END
+};
- return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
-}
+const char* const bus_scope_changing_properties[] = {
+ "Result",
+ NULL
+};
static int bus_scope_set_transient_property(
Scope *s,
const char *name,
- DBusMessageIter *i,
+ sd_bus_message *message,
UnitSetPropertiesMode mode,
- DBusError *error) {
+ sd_bus_error *error) {
int r;
- assert(name);
assert(s);
- assert(i);
+ assert(name);
+ assert(message);
if (streq(name, "PIDs")) {
- DBusMessageIter sub;
-
- if (dbus_message_iter_get_arg_type(i) != DBUS_TYPE_ARRAY ||
- dbus_message_iter_get_element_type(i) != DBUS_TYPE_UINT32)
- return -EINVAL;
+ unsigned n = 0;
+ uint32_t pid;
r = set_ensure_allocated(&s->pids, trivial_hash_func, trivial_compare_func);
if (r < 0)
return r;
- dbus_message_iter_recurse(i, &sub);
- while (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_UINT32) {
- uint32_t pid;
+ r = sd_bus_message_enter_container(message, 'a', "u");
+ if (r < 0)
+ return r;
- dbus_message_iter_get_basic(&sub, &pid);
+ while ((r = sd_bus_message_read(message, "u", &pid)) > 0) {
if (pid <= 1)
return -EINVAL;
- r = set_put(s->pids, LONG_TO_PTR(pid));
- if (r < 0 && r != -EEXIST)
- return r;
+ if (mode != UNIT_CHECK) {
+ r = set_put(s->pids, LONG_TO_PTR(pid));
+ if (r < 0 && r != -EEXIST)
+ return r;
+ }
- dbus_message_iter_next(&sub);
+ n++;
}
+ if (r < 0)
+ return r;
- if (set_size(s->pids) <= 0)
+ r = sd_bus_message_exit_container(message);
+ if (r < 0)
+ return r;
+
+ if (n <= 0)
return -EINVAL;
return 1;
+
+ } else if (streq(name, "TimeoutStopUSec")) {
+
+ if (mode != UNIT_CHECK) {
+ r = sd_bus_message_read(message, "t", &s->timeout_stop_usec);
+ if (r < 0)
+ return r;
+
+ unit_write_drop_in_format(UNIT(s), mode, name, "[Scope]\nTimeoutStopSec=%lluus\n", (unsigned long long) s->timeout_stop_usec);
+ } else {
+ r = sd_bus_message_skip(message, "t");
+ if (r < 0)
+ return r;
+ }
+
+ return 1;
}
return 0;
@@ -130,25 +114,29 @@ static int bus_scope_set_transient_property(
int bus_scope_set_property(
Unit *u,
const char *name,
- DBusMessageIter *i,
+ sd_bus_message *message,
UnitSetPropertiesMode mode,
- DBusError *error) {
+ sd_bus_error *error) {
Scope *s = SCOPE(u);
int r;
+ assert(s);
assert(name);
- assert(u);
- assert(i);
+ assert(message);
- r = bus_cgroup_set_property(u, &s->cgroup_context, name, i, mode, error);
+ r = bus_cgroup_set_property(u, &s->cgroup_context, name, message, mode, error);
if (r != 0)
return r;
if (u->load_state == UNIT_STUB) {
/* While we are created we still accept PIDs */
- r = bus_scope_set_transient_property(s, name, i, mode, error);
+ r = bus_scope_set_transient_property(s, name, message, mode, error);
+ if (r != 0)
+ return r;
+
+ r = bus_kill_context_set_transient_property(u, &s->kill_context, name, message, mode, error);
if (r != 0)
return r;
}