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/dbus-kill.h | |
parent | hashmap: be a bit more conservative with pre-allocating hash tables and items (diff) | |
download | systemd-718db96199eb307751264e4163555662c9a389fa.tar.xz systemd-718db96199eb307751264e4163555662c9a389fa.zip |
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-kill.h')
-rw-r--r-- | src/core/dbus-kill.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/core/dbus-kill.h b/src/core/dbus-kill.h index 7676d98e91..7c15f3a90b 100644 --- a/src/core/dbus-kill.h +++ b/src/core/dbus-kill.h @@ -21,17 +21,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include <dbus/dbus.h> +#include "sd-bus.h" +#include "unit.h" +#include "kill.h" -#include "manager.h" -#include "dbus-common.h" +extern const sd_bus_vtable bus_kill_vtable[]; -#define BUS_KILL_CONTEXT_INTERFACE \ - " <property name=\"KillMode\" type=\"s\" access=\"read\"/>\n" \ - " <property name=\"KillSignal\" type=\"i\" access=\"read\"/>\n" \ - " <property name=\"SendSIGKILL\" type=\"b\" access=\"read\"/>\n" \ - " <property name=\"SendSIGHUP\" type=\"b\" access=\"read\"/>\n" - -extern const BusProperty bus_kill_context_properties[]; - -int bus_kill_context_set_transient_property(Unit *u, KillContext *c, const char *name, DBusMessageIter *i, UnitSetPropertiesMode mode, DBusError *error); +int bus_kill_context_set_transient_property(Unit *u, KillContext *c, const char *name, sd_bus_message *message, UnitSetPropertiesMode mode, sd_bus_error *error); |