diff options
author | Lennart Poettering <lennart@poettering.net> | 2013-11-19 21:12:59 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2013-11-20 20:52:36 +0100 |
commit | 718db96199eb307751264e4163555662c9a389fa (patch) | |
tree | 9ec8467596ba1acba76bb6273c7797baf68c1a00 /src/core/slice.c | |
parent | 3febea3a0b0a968ea281e7959c1654cbaf95c9bf (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/slice.c')
-rw-r--r-- | src/core/slice.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/slice.c b/src/core/slice.c index 40d416e35e..1e42df2b8b 100644 --- a/src/core/slice.c +++ b/src/core/slice.c @@ -216,7 +216,7 @@ static int slice_stop(Unit *u) { return 0; } -static int slice_kill(Unit *u, KillWho who, int signo, DBusError *error) { +static int slice_kill(Unit *u, KillWho who, int signo, sd_bus_error *error) { return unit_kill_common(u, who, signo, -1, -1, error); } @@ -275,13 +275,13 @@ DEFINE_STRING_TABLE_LOOKUP(slice_state, SliceState); const UnitVTable slice_vtable = { .object_size = sizeof(Slice), + .cgroup_context_offset = offsetof(Slice, cgroup_context), + .sections = "Unit\0" "Slice\0" "Install\0", - .private_section = "Slice", - .cgroup_context_offset = offsetof(Slice, cgroup_context), .no_alias = true, .no_instances = true, @@ -306,7 +306,7 @@ const UnitVTable slice_vtable = { .sub_state_to_string = slice_sub_state_to_string, .bus_interface = "org.freedesktop.systemd1.Slice", - .bus_message_handler = bus_slice_message_handler, + .bus_vtable = bus_slice_vtable, .bus_set_property = bus_slice_set_property, .bus_commit_properties = bus_slice_commit_properties, |