X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fdbus-unit.h;h=57a5e19744a3c69f46b899fd72032f4f2c5f474a;hp=d22802d27440d71616ccc76456b980ff75decf1f;hb=1d22e9068c52c1cf935bcdff70b9b9654e3c939e;hpb=7c8fa05c4d5d01748ff2a04edb882afb3119b7d7

diff --git a/src/core/dbus-unit.h b/src/core/dbus-unit.h
index d22802d27..57a5e1974 100644
--- a/src/core/dbus-unit.h
+++ b/src/core/dbus-unit.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foodbusunithfoo
-#define foodbusunithfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -22,119 +21,19 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <dbus/dbus.h>
+#include "sd-bus.h"
+#include "unit.h"
 
-#include "manager.h"
-#include "dbus-common.h"
-
-#define BUS_UNIT_INTERFACE \
-        " <interface name=\"org.freedesktop.systemd1.Unit\">\n"         \
-        "  <method name=\"Start\">\n"                                   \
-        "   <arg name=\"mode\" type=\"s\" direction=\"in\"/>\n"         \
-        "   <arg name=\"job\" type=\"o\" direction=\"out\"/>\n"         \
-        "  </method>\n"                                                 \
-        "  <method name=\"Stop\">\n"                                    \
-        "   <arg name=\"mode\" type=\"s\" direction=\"in\"/>\n"         \
-        "   <arg name=\"job\" type=\"o\" direction=\"out\"/>\n"         \
-        "  </method>\n"                                                 \
-        "  <method name=\"Reload\">\n"                                  \
-        "   <arg name=\"mode\" type=\"s\" direction=\"in\"/>\n"         \
-        "   <arg name=\"job\" type=\"o\" direction=\"out\"/>\n"         \
-        "  </method>\n"                                                 \
-        "  <method name=\"Restart\">\n"                                 \
-        "   <arg name=\"mode\" type=\"s\" direction=\"in\"/>\n"         \
-        "   <arg name=\"job\" type=\"o\" direction=\"out\"/>\n"         \
-        "  </method>\n"                                                 \
-        "  <method name=\"TryRestart\">\n"                              \
-        "   <arg name=\"mode\" type=\"s\" direction=\"in\"/>\n"         \
-        "   <arg name=\"job\" type=\"o\" direction=\"out\"/>\n"         \
-        "  </method>\n"                                                 \
-        "  <method name=\"ReloadOrRestart\">\n"                         \
-        "   <arg name=\"mode\" type=\"s\" direction=\"in\"/>\n"         \
-        "   <arg name=\"job\" type=\"o\" direction=\"out\"/>\n"         \
-        "  </method>\n"                                                 \
-        "  <method name=\"ReloadOrTryRestart\">\n"                      \
-        "   <arg name=\"mode\" type=\"s\" direction=\"in\"/>\n"         \
-        "   <arg name=\"job\" type=\"o\" direction=\"out\"/>\n"         \
-        "  </method>\n"                                                 \
-        "  <method name=\"Kill\">\n"                                    \
-        "   <arg name=\"who\" type=\"s\" direction=\"in\"/>\n"          \
-        "   <arg name=\"mode\" type=\"s\" direction=\"in\"/>\n"         \
-        "   <arg name=\"signal\" type=\"i\" direction=\"in\"/>\n"       \
-        "  </method>\n"                                                 \
-        "  <method name=\"ResetFailed\"/>\n"                            \
-        "  <property name=\"Id\" type=\"s\" access=\"read\"/>\n"        \
-        "  <property name=\"Names\" type=\"as\" access=\"read\"/>\n"    \
-        "  <property name=\"Following\" type=\"s\" access=\"read\"/>\n" \
-        "  <property name=\"Requires\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"RequiresOverridable\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"Requisite\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"RequisiteOverridable\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"Wants\" type=\"as\" access=\"read\"/>\n"    \
-        "  <property name=\"BindTo\" type=\"as\" access=\"read\"/>\n"    \
-        "  <property name=\"RequiredBy\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"RequiredByOverridable\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"WantedBy\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"BoundBy\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"Conflicts\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"ConflictedBy\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"Before\" type=\"as\" access=\"read\"/>\n"   \
-        "  <property name=\"After\" type=\"as\" access=\"read\"/>\n"    \
-        "  <property name=\"OnFailure\" type=\"as\" access=\"read\"/>\n"    \
-        "  <property name=\"Triggers\" type=\"as\" access=\"read\"/>\n"    \
-        "  <property name=\"TriggeredBy\" type=\"as\" access=\"read\"/>\n"    \
-        "  <property name=\"PropagateReloadTo\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"PropagateReloadFrom\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"RequiresMountsFor\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"Description\" type=\"s\" access=\"read\"/>\n" \
-        "  <property name=\"LoadState\" type=\"s\" access=\"read\"/>\n" \
-        "  <property name=\"ActiveState\" type=\"s\" access=\"read\"/>\n" \
-        "  <property name=\"SubState\" type=\"s\" access=\"read\"/>\n"  \
-        "  <property name=\"FragmentPath\" type=\"s\" access=\"read\"/>\n" \
-        "  <property name=\"UnitFileState\" type=\"s\" access=\"read\"/>\n" \
-        "  <property name=\"InactiveExitTimestamp\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"InactiveExitTimestampMonotonic\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"ActiveEnterTimestamp\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"ActiveEnterTimestampMonotonic\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"ActiveExitTimestamp\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"ActiveExitTimestampMonotonic\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"InactiveEnterTimestamp\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"InactiveEnterTimestampMonotonic\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"CanStart\" type=\"b\" access=\"read\"/>\n"  \
-        "  <property name=\"CanStop\" type=\"b\" access=\"read\"/>\n"   \
-        "  <property name=\"CanReload\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"CanIsolate\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"Job\" type=\"(uo)\" access=\"read\"/>\n"    \
-        "  <property name=\"StopWhenUnneeded\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"RefuseManualStart\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"RefuseManualStop\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"AllowIsolate\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"DefaultDependencies\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"OnFailureIsolate\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"IgnoreOnIsolate\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"IgnoreOnSnapshot\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"DefaultControlGroup\" type=\"s\" access=\"read\"/>\n" \
-        "  <property name=\"ControlGroup\" type=\"as\" access=\"read\"/>\n" \
-        "  <property name=\"ControlGroupAttributes\" type=\"a(sss)\" access=\"read\"/>\n" \
-        "  <property name=\"NeedDaemonReload\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"JobTimeoutUSec\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"ConditionTimestamp\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"ConditionTimestampMonotonic\" type=\"t\" access=\"read\"/>\n" \
-        "  <property name=\"ConditionResult\" type=\"b\" access=\"read\"/>\n" \
-        "  <property name=\"LoadError\" type=\"(ss)\" access=\"read\"/>\n" \
-        " </interface>\n"
-
-#define BUS_UNIT_INTERFACES_LIST                \
-        BUS_GENERIC_INTERFACES_LIST             \
-        "org.freedesktop.systemd1.Unit\0"
-
-extern const BusProperty bus_unit_properties[];
+extern const sd_bus_vtable bus_unit_vtable[];
+extern const sd_bus_vtable bus_unit_cgroup_vtable[];
 
 void bus_unit_send_change_signal(Unit *u);
 void bus_unit_send_removed_signal(Unit *u);
 
-extern const DBusObjectPathVTable bus_unit_vtable;
-
-extern const char bus_unit_interface[];
+int bus_unit_method_start_generic(sd_bus *bus, sd_bus_message *message, Unit *u, JobType job_type, bool reload_if_possible, sd_bus_error *error);
+int bus_unit_method_kill(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
+int bus_unit_method_reset_failed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
 
-#endif
+int bus_unit_queue_job(sd_bus *bus, sd_bus_message *message, Unit *u, JobType type, JobMode mode, bool reload_if_possible, sd_bus_error *error);
+int bus_unit_set_properties(Unit *u, sd_bus_message *message, UnitSetPropertiesMode mode, bool commit, sd_bus_error *error);
+int bus_unit_method_set_properties(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);