[systemd-devel] [PATCH 1/2] dbus: consolidate service SysV conditionals

[Lennart Poettering]

On Fri, 11.03.11 15:26, Andrey Borzenkov (arvidjaar at gmail.com) wrote:

> No need to define the same set of properties twice. While on it,
> add FsckPassNo to introspection.

Looks good, but could you rename BUS_SERVICE_SYSV_INTERFACE to
BUS_SERVICE_SYSV_INTERFACE_FRAGMENT or so, since it isn't complete
interface data anymore, just a fragment, since it includes no
<<interface> tag.

> ---
>  src/dbus-service.c |   37 ++++++++-----------------------------
>  1 files changed, 8 insertions(+), 29 deletions(-)
> 
> diff --git a/src/dbus-service.c b/src/dbus-service.c
> index 6bb6a9d..ed28e22 100644
> --- a/src/dbus-service.c
> +++ b/src/dbus-service.c
> @@ -26,34 +26,14 @@
>  #include "dbus-service.h"
>  
>  #ifdef HAVE_SYSV_COMPAT
> -#define BUS_SERVICE_INTERFACE                                           \
> -        " <interface name=\"org.freedesktop.systemd1.Service\">\n"      \
> -        "  <property name=\"Type\" type=\"s\" access=\"read\"/>\n"      \
> -        "  <property name=\"Restart\" type=\"s\" access=\"read\"/>\n"   \
> -        "  <property name=\"PIDFile\" type=\"s\" access=\"read\"/>\n"   \
> -        "  <property name=\"NotifyAccess\" type=\"s\" access=\"read\"/>\n" \
> -        "  <property name=\"RestartUSec\" type=\"t\" access=\"read\"/>\n" \
> -        "  <property name=\"TimeoutUSec\" type=\"t\" access=\"read\"/>\n" \
> -        BUS_EXEC_COMMAND_INTERFACE("ExecStartPre")                      \
> -        BUS_EXEC_COMMAND_INTERFACE("ExecStart")                         \
> -        BUS_EXEC_COMMAND_INTERFACE("ExecStartPost")                     \
> -        BUS_EXEC_COMMAND_INTERFACE("ExecReload")                        \
> -        BUS_EXEC_COMMAND_INTERFACE("ExecStop")                          \
> -        BUS_EXEC_COMMAND_INTERFACE("ExecStopPost")                      \
> -        BUS_EXEC_CONTEXT_INTERFACE                                      \
> -        "  <property name=\"PermissionsStartOnly\" type=\"b\" access=\"read\"/>\n" \
> -        "  <property name=\"RootDirectoryStartOnly\" type=\"b\" access=\"read\"/>\n" \
> -        "  <property name=\"RemainAfterExit\" type=\"b\" access=\"read\"/>\n" \
> -        BUS_EXEC_STATUS_INTERFACE("ExecMain")                           \
> -        "  <property name=\"MainPID\" type=\"u\" access=\"read\"/>\n"   \
> -        "  <property name=\"ControlPID\" type=\"u\" access=\"read\"/>\n" \
> +#define BUS_SERVICE_SYSV_INTERFACE                                     \
>          "  <property name=\"SysVStartPriority\" type=\"i\" access=\"read\"/>\n" \
>          "  <property name=\"SysVRunLevels\" type=\"s\" access=\"read\"/>\n" \
> -        "  <property name=\"SysVPath\" type=\"s\" access=\"read\"/>\n"  \
> -        "  <property name=\"BusName\" type=\"s\" access=\"read\"/>\n"   \
> -        "  <property name=\"StatusText\" type=\"s\" access=\"read\"/>\n" \
> -       " </interface>\n"
> +        "  <property name=\"SysVPath\" type=\"s\" access=\"read\"/>\n"
>  #else
> +#define BUS_SERVICE_SYSV_INTERFACE ""
> +#endif
> +
>  #define BUS_SERVICE_INTERFACE                                           \
>          " <interface name=\"org.freedesktop.systemd1.Service\">\n"      \
>          "  <property name=\"Type\" type=\"s\" access=\"read\"/>\n"      \
> @@ -77,8 +57,9 @@
>          "  <property name=\"ControlPID\" type=\"u\" access=\"read\"/>\n" \
>          "  <property name=\"BusName\" type=\"s\" access=\"read\"/>\n"   \
>          "  <property name=\"StatusText\" type=\"s\" access=\"read\"/>\n" \
> +        "  <property name=\"FsckPassNo\" type=\"i\" access=\"read\"/>\n" \
> +        BUS_SERVICE_SYSV_INTERFACE                                       \
>         " </interface>\n"
> -#endif
>  
>  #define INTROSPECTION                                                   \
>          DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE                       \
> @@ -135,14 +116,12 @@ DBusHandlerResult bus_service_message_handler(Unit *u, DBusConnection *connectio
>                 BUS_EXEC_STATUS_PROPERTIES("org.freedesktop.systemd1.Service", u->service.main_exec_status, "ExecMain"),
>                  { "org.freedesktop.systemd1.Service", "MainPID",                bus_property_append_pid,    "u", &u->service.main_pid                  },
>                  { "org.freedesktop.systemd1.Service", "ControlPID",             bus_property_append_pid,    "u", &u->service.control_pid               },
> -#ifdef HAVE_SYSV_COMPAT
> -                { "org.freedesktop.systemd1.Service", "SysVPath",               bus_property_append_string, "s", u->service.sysv_path                  },
> -#endif
>                  { "org.freedesktop.systemd1.Service", "BusName",                bus_property_append_string, "s", u->service.bus_name                   },
>                  { "org.freedesktop.systemd1.Service", "StatusText",             bus_property_append_string, "s", u->service.status_text                },
>  #ifdef HAVE_SYSV_COMPAT
>                  { "org.freedesktop.systemd1.Service", "SysVRunLevels",          bus_property_append_string, "s", u->service.sysv_runlevels             },
>                  { "org.freedesktop.systemd1.Service", "SysVStartPriority",      bus_property_append_int,    "i", &u->service.sysv_start_priority       },
> +                { "org.freedesktop.systemd1.Service", "SysVPath",               bus_property_append_string, "s", u->service.sysv_path                  },
>  #endif
>                  { "org.freedesktop.systemd1.Service", "FsckPassNo",             bus_property_append_int,    "i", &u->service.fsck_passno               },
>                  { NULL, NULL, NULL, NULL, NULL }


Lennart

-- 
Lennart Poettering - Red Hat, Inc.