summaryrefslogtreecommitdiff
path: root/src/core/dbus-slice.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-11-19 21:12:59 +0100
committerLennart Poettering <lennart@poettering.net>2013-11-20 20:52:36 +0100
commit718db96199eb307751264e4163555662c9a389fa (patch)
tree9ec8467596ba1acba76bb6273c7797baf68c1a00 /src/core/dbus-slice.c
parent3febea3a0b0a968ea281e7959c1654cbaf95c9bf (diff)
core: convert PID 1 to libsystemd-bus
This patch converts PID 1 to libsystemd-bus and thus drops the dependency on libdbus. The only remaining code using libdbus is a test case that validates our bus marshalling against libdbus' marshalling, and this dependency can be turned off. This patch also adds a couple of things to libsystem-bus, that are necessary to make the port work: - Synthesizing of "Disconnected" messages when bus connections are severed. - Support for attaching multiple vtables for the same interface on the same path. This patch also fixes the SetDefaultTarget() and GetDefaultTarget() bus calls which used an inappropriate signature. As a side effect we will now generate PropertiesChanged messages which carry property contents, rather than just invalidation information.
Diffstat (limited to 'src/core/dbus-slice.c')
-rw-r--r--src/core/dbus-slice.c58
1 files changed, 9 insertions, 49 deletions
diff --git a/src/core/dbus-slice.c b/src/core/dbus-slice.c
index eeefcdbcd6..2a48ea455e 100644
--- a/src/core/dbus-slice.c
+++ b/src/core/dbus-slice.c
@@ -19,70 +19,30 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <errno.h>
-
+#include "unit.h"
+#include "slice.h"
#include "dbus-unit.h"
-#include "dbus-common.h"
#include "dbus-cgroup.h"
-#include "selinux-access.h"
#include "dbus-slice.h"
-#define BUS_SLICE_INTERFACE \
- " <interface name=\"org.freedesktop.systemd1.Slice\">\n" \
- BUS_UNIT_CGROUP_INTERFACE \
- BUS_CGROUP_CONTEXT_INTERFACE \
- " </interface>\n"
-
-#define INTROSPECTION \
- DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \
- "<node>\n" \
- BUS_UNIT_INTERFACE \
- BUS_SLICE_INTERFACE \
- BUS_PROPERTIES_INTERFACE \
- BUS_PEER_INTERFACE \
- BUS_INTROSPECTABLE_INTERFACE \
- "</node>\n"
-
-#define INTERFACES_LIST \
- BUS_UNIT_INTERFACES_LIST \
- "org.freedesktop.systemd1.Slice\0"
-
-const char bus_slice_interface[] = BUS_SLICE_INTERFACE;
-
-DBusHandlerResult bus_slice_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
- Slice *s = SLICE(u);
-
- const BusBoundProperties bps[] = {
- { "org.freedesktop.systemd1.Unit", bus_unit_properties, u },
- { "org.freedesktop.systemd1.Slice", bus_unit_cgroup_properties, u },
- { "org.freedesktop.systemd1.Slice", bus_cgroup_context_properties, &s->cgroup_context },
- {}
- };
-
- SELINUX_UNIT_ACCESS_CHECK(u, c, message, "status");
-
- return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
-}
+const sd_bus_vtable bus_slice_vtable[] = {
+ SD_BUS_VTABLE_START(0),
+ SD_BUS_VTABLE_END
+};
int bus_slice_set_property(
Unit *u,
const char *name,
- DBusMessageIter *i,
+ sd_bus_message *message,
UnitSetPropertiesMode mode,
- DBusError *error) {
+ sd_bus_error *error) {
Slice *s = SLICE(u);
- int r;
assert(name);
assert(u);
- assert(i);
-
- r = bus_cgroup_set_property(u, &s->cgroup_context, name, i, mode, error);
- if (r != 0)
- return r;
- return 0;
+ return bus_cgroup_set_property(u, &s->cgroup_context, name, message, mode, error);
}
int bus_slice_commit_properties(Unit *u) {