chiark / gitweb /
core: no need to list properties for PropertiesChanged messages anymore
authorLennart Poettering <lennart@poettering.net>
Sun, 22 Dec 2013 02:43:03 +0000 (03:43 +0100)
committerLennart Poettering <lennart@poettering.net>
Sun, 22 Dec 2013 02:50:52 +0000 (03:50 +0100)
Since the vtable includes this information anyway, let's just use that

32 files changed:
src/core/automount.c
src/core/busname.c
src/core/dbus-automount.c
src/core/dbus-automount.h
src/core/dbus-busname.c
src/core/dbus-busname.h
src/core/dbus-device.c
src/core/dbus-device.h
src/core/dbus-mount.c
src/core/dbus-mount.h
src/core/dbus-path.c
src/core/dbus-path.h
src/core/dbus-scope.c
src/core/dbus-scope.h
src/core/dbus-service.c
src/core/dbus-service.h
src/core/dbus-socket.c
src/core/dbus-socket.h
src/core/dbus-swap.c
src/core/dbus-swap.h
src/core/dbus-timer.c
src/core/dbus-timer.h
src/core/dbus-unit.c
src/core/device.c
src/core/mount.c
src/core/path.c
src/core/scope.c
src/core/service.c
src/core/socket.c
src/core/swap.c
src/core/timer.c
src/core/unit.h

index c6e0a74..c44521c 100644 (file)
@@ -874,7 +874,6 @@ const UnitVTable automount_vtable = {
 
         .bus_interface = "org.freedesktop.systemd1.Automount",
         .bus_vtable = bus_automount_vtable,
-        .bus_changing_properties = bus_automount_changing_properties,
 
         .shutdown = automount_shutdown,
 
index 034e5f6..9b6bf07 100644 (file)
@@ -584,7 +584,6 @@ const UnitVTable busname_vtable = {
 
         .bus_interface = "org.freedesktop.systemd1.BusName",
         .bus_vtable = bus_busname_vtable,
-        .bus_changing_properties = bus_busname_changing_properties,
 
         .status_message_formats = {
                 .finished_start_job = {
index 8559aed..b2a510a 100644 (file)
@@ -34,8 +34,3 @@ const sd_bus_vtable bus_automount_vtable[] = {
         SD_BUS_PROPERTY("Result", "s", property_get_result, offsetof(Automount, result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_VTABLE_END
 };
-
-const char* const bus_automount_changing_properties[] = {
-        "Result",
-        NULL
-};
index 0b96183..1bec953 100644 (file)
@@ -24,4 +24,3 @@
 #include "sd-bus.h"
 
 extern const sd_bus_vtable bus_automount_vtable[];
-extern const char* const bus_automount_changing_properties[];
index 9f94bf1..854491b 100644 (file)
@@ -33,8 +33,3 @@ const sd_bus_vtable bus_busname_vtable[] = {
         SD_BUS_PROPERTY("Result", "s", property_get_result, offsetof(BusName, result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_VTABLE_END
 };
-
-const char* const bus_busname_changing_properties[] = {
-        "Result",
-        NULL
-};
index 3a29317..b5eed37 100644 (file)
@@ -25,4 +25,3 @@
 #include "unit.h"
 
 extern const sd_bus_vtable bus_busname_vtable[];
-extern const char* const bus_busname_changing_properties[];
index 621bab0..f556536 100644 (file)
@@ -29,8 +29,3 @@ const sd_bus_vtable bus_device_vtable[] = {
         SD_BUS_PROPERTY("SysFSPath", "s", NULL, offsetof(Device, sysfs), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_VTABLE_END
 };
-
-const char* const bus_device_changing_properties[] = {
-        "SysFSPath",
-        NULL
-};
index f248c28..4aff226 100644 (file)
@@ -25,4 +25,3 @@
 #include "unit.h"
 
 extern const sd_bus_vtable bus_device_vtable[];
-extern const char* const bus_device_changing_properties[];
index 3b58808..28f0e90 100644 (file)
@@ -124,15 +124,6 @@ const sd_bus_vtable bus_mount_vtable[] = {
         SD_BUS_VTABLE_END
 };
 
-const char * const bus_mount_changing_properties[] = {
-        "What",
-        "Options",
-        "Type",
-        "ControlPID",
-        "Result",
-        NULL
-};
-
 int bus_mount_set_property(
                 Unit *u,
                 const char *name,
index 4bb5d2d..f7004d2 100644 (file)
@@ -25,7 +25,6 @@
 #include "unit.h"
 
 extern const sd_bus_vtable bus_mount_vtable[];
-extern const char * const bus_mount_changing_properties[];
 
 int bus_mount_set_property(Unit *u, const char *name, sd_bus_message *message, UnitSetPropertiesMode mode, sd_bus_error *error);
 int bus_mount_commit_properties(Unit *u);
index 36c4e0f..b5e8941 100644 (file)
@@ -86,8 +86,3 @@ const sd_bus_vtable bus_path_vtable[] = {
         SD_BUS_PROPERTY("Result", "s", property_get_result, offsetof(Path, result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_VTABLE_END
 };
-
-const char* const bus_path_changing_properties[] = {
-        "Result",
-        NULL
-};
index e9558f8..667da05 100644 (file)
@@ -25,4 +25,3 @@
 #include "sd-bus.h"
 
 extern const sd_bus_vtable bus_path_vtable[];
-extern const char* const bus_path_changing_properties[];
index b20b6e7..bb251ed 100644 (file)
@@ -36,11 +36,6 @@ const sd_bus_vtable bus_scope_vtable[] = {
         SD_BUS_VTABLE_END
 };
 
-const char* const bus_scope_changing_properties[] = {
-        "Result",
-        NULL
-};
-
 static int bus_scope_set_transient_property(
                 Scope *s,
                 const char *name,
index 30c5e1e..7e8f005 100644 (file)
@@ -25,7 +25,6 @@
 #include "unit.h"
 
 extern const sd_bus_vtable bus_scope_vtable[];
-extern const char* const bus_scope_changing_properties[];
 
 int bus_scope_set_property(Unit *u, const char *name, sd_bus_message *i, UnitSetPropertiesMode mode, sd_bus_error *error);
 int bus_scope_commit_properties(Unit *u);
index 25af7ac..3db9339 100644 (file)
@@ -69,21 +69,6 @@ const sd_bus_vtable bus_service_vtable[] = {
         SD_BUS_VTABLE_END
 };
 
-const char* const bus_service_changing_properties[] = {
-        "ExecMainStartTimestamp",
-        "ExecMainStartTimestampMonotonic",
-        "ExecMainExitTimestamp",
-        "ExecMainExitTimestampMonotonic",
-        "ExecMainPID",
-        "ExecMainCode",
-        "ExecMainStatus",
-        "MainPID",
-        "ControlPID",
-        "StatusText",
-        "Result",
-        NULL
-};
-
 static int bus_service_set_transient_property(
                 Service *s,
                 const char *name,
index 5fa9b2f..aab9f7a 100644 (file)
@@ -25,7 +25,6 @@
 #include "unit.h"
 
 extern const sd_bus_vtable bus_service_vtable[];
-extern const char* const bus_service_changing_properties[];
 
 int bus_service_set_property(Unit *u, const char *name, sd_bus_message *i, UnitSetPropertiesMode mode, sd_bus_error *error);
 int bus_service_commit_properties(Unit *u);
index c64bf82..bb9d419 100644 (file)
@@ -90,7 +90,6 @@ const sd_bus_vtable bus_socket_vtable[] = {
         SD_BUS_PROPERTY("BindIPv6Only", "s", property_get_bind_ipv6_only, offsetof(Socket, bind_ipv6_only), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("Backlog", "u", bus_property_get_unsigned, offsetof(Socket, backlog), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("TimeoutUSec", "t", bus_property_get_usec, offsetof(Socket, timeout_usec), SD_BUS_VTABLE_PROPERTY_CONST),
-        SD_BUS_PROPERTY("ControlPID", "u", bus_property_get_pid, offsetof(Socket, control_pid), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_PROPERTY("BindToDevice", "s", NULL, offsetof(Socket, bind_to_device), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("DirectoryMode", "u", bus_property_get_mode, offsetof(Socket, directory_mode), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("SocketMode", "u", bus_property_get_mode, offsetof(Socket, socket_mode), SD_BUS_VTABLE_PROPERTY_CONST),
@@ -110,15 +109,16 @@ const sd_bus_vtable bus_socket_vtable[] = {
         SD_BUS_PROPERTY("Listen", "a(ss)", property_get_listen, 0, SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("Mark", "i", bus_property_get_int, offsetof(Socket, mark), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("MaxConnections", "u", bus_property_get_unsigned, offsetof(Socket, max_connections), SD_BUS_VTABLE_PROPERTY_CONST),
-        SD_BUS_PROPERTY("NConnections", "u", bus_property_get_unsigned, offsetof(Socket, n_connections), 0),
-        SD_BUS_PROPERTY("NAccepted", "u", bus_property_get_unsigned, offsetof(Socket, n_accepted), 0),
         SD_BUS_PROPERTY("MessageQueueMaxMessages", "x", bus_property_get_long, offsetof(Socket, mq_maxmsg), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("MessageQueueMessageSize", "x", bus_property_get_long, offsetof(Socket, mq_msgsize), SD_BUS_VTABLE_PROPERTY_CONST),
-        SD_BUS_PROPERTY("Result", "s", property_get_result, offsetof(Socket, result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_PROPERTY("ReusePort", "b",  bus_property_get_bool, offsetof(Socket, reuse_port), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("SmackLabel", "s", NULL, offsetof(Socket, smack), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("SmackLabelIPIn", "s", NULL, offsetof(Socket, smack_ip_in), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("SmackLabelIPOut", "s", NULL, offsetof(Socket, smack_ip_out), SD_BUS_VTABLE_PROPERTY_CONST),
+        SD_BUS_PROPERTY("ControlPID", "u", bus_property_get_pid, offsetof(Socket, control_pid), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+        SD_BUS_PROPERTY("Result", "s", property_get_result, offsetof(Socket, result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+        SD_BUS_PROPERTY("NConnections", "u", bus_property_get_unsigned, offsetof(Socket, n_connections), 0),
+        SD_BUS_PROPERTY("NAccepted", "u", bus_property_get_unsigned, offsetof(Socket, n_accepted), 0),
         BUS_EXEC_COMMAND_LIST_VTABLE("ExecStartPre", offsetof(Socket, exec_command[SOCKET_EXEC_START_PRE]), SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION),
         BUS_EXEC_COMMAND_LIST_VTABLE("ExecStartPost", offsetof(Socket, exec_command[SOCKET_EXEC_START_POST]), SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION),
         BUS_EXEC_COMMAND_LIST_VTABLE("ExecStopPre", offsetof(Socket, exec_command[SOCKET_EXEC_STOP_PRE]), SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION),
@@ -126,14 +126,6 @@ const sd_bus_vtable bus_socket_vtable[] = {
         SD_BUS_VTABLE_END
 };
 
-const char* const bus_socket_changing_properties[] = {
-        "ControlPID",
-        "NAccepted",
-        "NConnections",
-        "Result",
-        NULL
-};
-
 int bus_socket_set_property(
                 Unit *u,
                 const char *name,
index 8808fa2..17164d9 100644 (file)
@@ -25,7 +25,6 @@
 #include "unit.h"
 
 extern const sd_bus_vtable bus_socket_vtable[];
-extern const char* const bus_socket_changing_properties[];
 
 int bus_socket_set_property(Unit *u, const char *name, sd_bus_message *message, UnitSetPropertiesMode mode, sd_bus_error *error);
 int bus_socket_commit_properties(Unit *u);
index bad53fe..7bd05db 100644 (file)
@@ -69,14 +69,6 @@ const sd_bus_vtable bus_swap_vtable[] = {
         SD_BUS_VTABLE_END
 };
 
-const char* const bus_swap_changing_properties[] = {
-        "What",
-        "Priority",
-        "ControlPID",
-        "Result",
-        NULL
-};
-
 int bus_swap_set_property(
                 Unit *u,
                 const char *name,
index 5d35737..9469f68 100644 (file)
@@ -26,7 +26,6 @@
 #include "unit.h"
 
 extern const sd_bus_vtable bus_swap_vtable[];
-extern const char* const bus_swap_changing_properties[];
 
 int bus_swap_set_property(Unit *u, const char *name, sd_bus_message *message, UnitSetPropertiesMode mode, sd_bus_error *error);
 int bus_swap_commit_properties(Unit *u);
index b37c0d0..277a45c 100644 (file)
@@ -146,10 +146,3 @@ const sd_bus_vtable bus_timer_vtable[] = {
         SD_BUS_PROPERTY("AccuracyUSec", "t", bus_property_get_usec, offsetof(Timer, accuracy_usec), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_VTABLE_END
 };
-
-const char* const bus_timer_changing_properties[] = {
-        "NextElapseUSecRealtime",
-        "NextElapseUSecMonotonic",
-        "Result",
-        NULL
-};
index ddd311c..cfff88e 100644 (file)
@@ -24,4 +24,3 @@
 #include "sd-bus.h"
 
 extern const sd_bus_vtable bus_timer_vtable[];
-extern const char* const bus_timer_changing_properties[];
index 7a566ff..4d3e3cc 100644 (file)
@@ -634,29 +634,25 @@ static int send_changed_signal(sd_bus *bus, const char *destination, void *userd
          * type, then for the generic unit. The clients may rely on
          * this order to get atomic behavior if needed. */
 
-        if (UNIT_VTABLE(u)->bus_changing_properties) {
-
-                r = sd_bus_emit_properties_changed_strv(
-                                bus, p,
-                                UNIT_VTABLE(u)->bus_interface,
-                                (char**) UNIT_VTABLE(u)->bus_changing_properties);
-                if (r < 0)
-                        return r;
+        r = sd_bus_emit_properties_changed_strv(
+                        bus, p,
+                        UNIT_VTABLE(u)->bus_interface,
+                        NULL);
+        if (r < 0) {
+                log_warning("Failed to send out specific PropertiesChanged signal for %s: %s", u->id, strerror(-r));
+                return r;
         }
 
-        return sd_bus_emit_properties_changed(
+        r = sd_bus_emit_properties_changed_strv(
                         bus, p,
                         "org.freedesktop.systemd1.Unit",
-                        "ActiveState",
-                        "SubState",
-                        "InactiveExitTimestamp",
-                        "ActiveEnterTimestamp",
-                        "ActiveExitTimestamp",
-                        "InactiveEnterTimestamp",
-                        "Job",
-                        "ConditionResult",
-                        "ConditionTimestamp",
                         NULL);
+        if (r < 0) {
+                log_warning("Failed to send out generic PropertiesChanged signal for %s: %s", u->id, strerror(-r));
+                return r;
+        }
+
+        return 0;
 }
 
 void bus_unit_send_change_signal(Unit *u) {
index 72d98ae..2c44dec 100644 (file)
@@ -653,7 +653,6 @@ const UnitVTable device_vtable = {
         .sub_state_to_string = device_sub_state_to_string,
 
         .bus_interface = "org.freedesktop.systemd1.Device",
-        .bus_changing_properties = bus_device_changing_properties,
         .bus_vtable = bus_device_vtable,
 
         .following = device_following,
index 77493db..2b7934e 100644 (file)
@@ -1793,7 +1793,6 @@ const UnitVTable mount_vtable = {
 
         .bus_interface = "org.freedesktop.systemd1.Mount",
         .bus_vtable = bus_mount_vtable,
-        .bus_changing_properties = bus_mount_changing_properties,
         .bus_set_property = bus_mount_set_property,
         .bus_commit_properties = bus_mount_commit_properties,
 
index 51e8d1d..fc7069e 100644 (file)
@@ -805,6 +805,5 @@ const UnitVTable path_vtable = {
         .reset_failed = path_reset_failed,
 
         .bus_interface = "org.freedesktop.systemd1.Path",
-        .bus_vtable = bus_path_vtable,
-        .bus_changing_properties = bus_path_changing_properties
+        .bus_vtable = bus_path_vtable
 };
index a3c9479..56c3746 100644 (file)
@@ -492,7 +492,6 @@ const UnitVTable scope_vtable = {
 
         .bus_interface = "org.freedesktop.systemd1.Scope",
         .bus_vtable = bus_scope_vtable,
-        .bus_changing_properties = bus_scope_changing_properties,
         .bus_set_property = bus_scope_set_property,
         .bus_commit_properties = bus_scope_commit_properties,
 
index 6c82ced..87eaa29 100644 (file)
@@ -3836,7 +3836,6 @@ const UnitVTable service_vtable = {
 
         .bus_interface = "org.freedesktop.systemd1.Service",
         .bus_vtable = bus_service_vtable,
-        .bus_changing_properties = bus_service_changing_properties,
         .bus_set_property = bus_service_set_property,
         .bus_commit_properties = bus_service_commit_properties,
 
index d6289a3..2442221 100644 (file)
@@ -2424,7 +2424,6 @@ const UnitVTable socket_vtable = {
 
         .bus_interface = "org.freedesktop.systemd1.Socket",
         .bus_vtable = bus_socket_vtable,
-        .bus_changing_properties = bus_socket_changing_properties,
         .bus_set_property = bus_socket_set_property,
         .bus_commit_properties = bus_socket_commit_properties,
 
index b197eb4..79862e5 100644 (file)
@@ -1445,7 +1445,6 @@ const UnitVTable swap_vtable = {
 
         .bus_interface = "org.freedesktop.systemd1.Swap",
         .bus_vtable = bus_swap_vtable,
-        .bus_changing_properties = bus_swap_changing_properties,
         .bus_set_property = bus_swap_set_property,
         .bus_commit_properties = bus_swap_commit_properties,
 
index f23582c..a4ff662 100644 (file)
@@ -646,5 +646,4 @@ const UnitVTable timer_vtable = {
 
         .bus_interface = "org.freedesktop.systemd1.Timer",
         .bus_vtable = bus_timer_vtable,
-        .bus_changing_properties = bus_timer_changing_properties,
 };
index 8ceeece..45816ea 100644 (file)
@@ -426,9 +426,6 @@ struct UnitVTable {
         /* The bus vtable */
         const sd_bus_vtable *bus_vtable;
 
-        /* strv list of changing properties */
-        const char * const * const bus_changing_properties;
-
         /* The strings to print in status messages */
         UnitStatusMessageFormats status_message_formats;