summaryrefslogtreecommitdiff
path: root/src/core/dbus-cgroup.h
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-cgroup.h
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-cgroup.h')
-rw-r--r--src/core/dbus-cgroup.h24
1 files changed, 4 insertions, 20 deletions
diff --git a/src/core/dbus-cgroup.h b/src/core/dbus-cgroup.h
index e5ac4c3af7..c2a3910f3d 100644
--- a/src/core/dbus-cgroup.h
+++ b/src/core/dbus-cgroup.h
@@ -21,25 +21,9 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <dbus/dbus.h>
-
-#include "manager.h"
-#include "dbus-common.h"
+#include "sd-bus.h"
#include "cgroup.h"
-#define BUS_CGROUP_CONTEXT_INTERFACE \
- " <property name=\"CPUAccounting\" type=\"b\" access=\"read\"/>\n" \
- " <property name=\"CPUShares\" type=\"t\" access=\"read\"/>\n" \
- " <property name=\"BlockIOAccounting\" type=\"b\" access=\"read\"/>\n" \
- " <property name=\"BlockIOWeight\" type=\"t\" access=\"read\"/>\n" \
- " <property name=\"BlockIODeviceWeight\" type=\"a(st)\" access=\"read\"/>\n" \
- " <property name=\"BlockIOReadBandwidth=\" type=\"a(st)\" access=\"read\"/>\n" \
- " <property name=\"BlockIOWriteBandwidth=\" type=\"a(st)\" access=\"read\"/>\n" \
- " <property name=\"MemoryAccounting\" type=\"b\" access=\"read\"/>\n" \
- " <property name=\"MemoryLimit\" type=\"t\" access=\"read\"/>\n" \
- " <property name=\"DevicePolicy\" type=\"s\" access=\"read\"/>\n" \
- " <property name=\"DeviceAllow\" type=\"a(ss)\" access=\"read\"/>\n"
-
-extern const BusProperty bus_cgroup_context_properties[];
-
-int bus_cgroup_set_property(Unit *u, CGroupContext *c, const char *name, DBusMessageIter *i, UnitSetPropertiesMode mode, DBusError *error);
+extern const sd_bus_vtable bus_cgroup_vtable[];
+
+int bus_cgroup_set_property(Unit *u, CGroupContext *c, const char *name, sd_bus_message *message, UnitSetPropertiesMode mode, sd_bus_error *error);