dbus: Aggregate PropertiesChanged signals

Instead of sending PropertiesChanged signals for each changed
property separately, mark properties as changed and send aggregated
PropertiesChanged signals for each interface in each object.
Aggregated PropertiesChanged signal is sent
- for all object after responding on DBus call
- for specified object after manual call to
  wpa_dbus_flush_object_changed_properties() function
- for each object separately after short timeout (currently 5 ms)
  which starts when first property in object is marked changed

wpa_supplicant/dbus/dbus_new.c

@@ -405,17 +405,13 @@ void wpas_dbus_signal_network_enabled_changed(struct wpa_supplicant *wpa_s,
 					      struct wpa_ssid *ssid)
 {
 
-	struct network_handler_args args = { wpa_s, ssid };
 	char path[WPAS_DBUS_OBJECT_PATH_MAX];
 	os_snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
 		    "%s/" WPAS_DBUS_NEW_NETWORKS_PART "/%d",
 		    wpa_s->dbus_new_path, ssid->id);
 
-	wpa_dbus_signal_property_changed(wpa_s->global->dbus,
+	wpa_dbus_mark_property_changed(wpa_s->global->dbus, path,
-					 (WPADBusPropertyAccessor)
+				       WPAS_DBUS_NEW_IFACE_NETWORK, "Enabled");
-					 wpas_dbus_getter_enabled, &args,
-					 path, WPAS_DBUS_NEW_IFACE_NETWORK,
-					 "Enabled");
 }
 
 
@@ -698,9 +694,9 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
 		return;
 	}
 
-	wpa_dbus_signal_property_changed(wpa_s->global->dbus,
+	wpa_dbus_mark_property_changed(wpa_s->global->dbus,
-					 getter, wpa_s, wpa_s->dbus_new_path,
+				       wpa_s->dbus_new_path,
-					 WPAS_DBUS_NEW_IFACE_INTERFACE, prop);
+				       WPAS_DBUS_NEW_IFACE_INTERFACE, prop);
 }
 
 
@@ -712,12 +708,9 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
  */
 void wpas_dbus_signal_debug_level_changed(struct wpa_global *global)
 {
-	wpa_dbus_signal_property_changed(global->dbus,
+	wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
-					 (WPADBusPropertyAccessor)
+				       WPAS_DBUS_NEW_INTERFACE,
-					 wpas_dbus_getter_debug_level,
+				       "DebugLevel");
-					 global, WPAS_DBUS_NEW_PATH,
-					 WPAS_DBUS_NEW_INTERFACE,
-					 "DebugLevel");
 }
 
 
@@ -729,12 +722,9 @@ void wpas_dbus_signal_debug_level_changed(struct wpa_global *global)
  */
 void wpas_dbus_signal_debug_timestamp_changed(struct wpa_global *global)
 {
-	wpa_dbus_signal_property_changed(global->dbus,
+	wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
-					 (WPADBusPropertyAccessor)
+				       WPAS_DBUS_NEW_INTERFACE,
-					 wpas_dbus_getter_debug_timestamp,
+				       "DebugTimestamp");
-					 global, WPAS_DBUS_NEW_PATH,
-					 WPAS_DBUS_NEW_INTERFACE,
-					 "DebugTimestamp");
 }
 
 
@@ -746,12 +736,9 @@ void wpas_dbus_signal_debug_timestamp_changed(struct wpa_global *global)
  */
 void wpas_dbus_signal_debug_show_keys_changed(struct wpa_global *global)
 {
-	wpa_dbus_signal_property_changed(global->dbus,
+	wpa_dbus_mark_property_changed(global->dbus, WPAS_DBUS_NEW_PATH,
-					 (WPADBusPropertyAccessor)
+				       WPAS_DBUS_NEW_INTERFACE,
-					 wpas_dbus_getter_debug_show_keys,
+				       "DebugShowKeys");
-					 global, WPAS_DBUS_NEW_PATH,
-					 WPAS_DBUS_NEW_INTERFACE,
-					 "DebugShowKeys");
 }
 
 
@@ -762,11 +749,21 @@ static void wpas_dbus_register(struct wpa_dbus_object_desc *obj_desc,
 			       const struct wpa_dbus_property_desc *properties,
 			       const struct wpa_dbus_signal_desc *signals)
 {
+	int n;
+
 	obj_desc->user_data = priv;
 	obj_desc->user_data_free_func = priv_free;
 	obj_desc->methods = methods;
 	obj_desc->properties = properties;
 	obj_desc->signals = signals;
+
+	for (n = 0; properties && properties->dbus_property; properties++);
+		n++;
+
+	obj_desc->prop_changed_flags = os_zalloc(n);
+	if (!obj_desc->prop_changed_flags)
+		wpa_printf(MSG_DEBUG, "dbus: %s: can't register handlers",
+			   __func__);
 }
 
 

wpa_supplicant/dbus/dbus_new_handlers_wps.c

@@ -322,13 +322,10 @@ DBusMessage * wpas_dbus_setter_process_credentials(
 	wpa_s->conf->wps_cred_processing = (process_credentials ? 2 : 1);
 
 	if ((wpa_s->conf->wps_cred_processing != 1) != old_pc)
-		wpa_dbus_signal_property_changed(
+		wpa_dbus_mark_property_changed(wpa_s->global->dbus,
-			wpa_s->global->dbus,
+					       wpa_s->dbus_new_path,
-			(WPADBusPropertyAccessor)
+					       WPAS_DBUS_NEW_IFACE_WPS,
-			wpas_dbus_getter_process_credentials,
+					       "ProcessCredentials");
-			wpa_s, wpa_s->dbus_new_path,
-			WPAS_DBUS_NEW_IFACE_WPS,
-			"ProcessCredentials");
 
 	return NULL;
 }

wpa_supplicant/dbus/dbus_new_helpers.c

@@ -13,11 +13,13 @@
  * See README and COPYING for more details.
  */
 
-#include "includes.h"
+#include "utils/includes.h"
 
-#include "common.h"
+#include "utils/common.h"
+#include "utils/eloop.h"
 #include "dbus_common.h"
 #include "dbus_common_i.h"
+#include "dbus_new.h"
 #include "dbus_new_helpers.h"
 
 
@@ -435,6 +437,9 @@ static DBusHandlerResult message_handler(DBusConnection *connection,
 			dbus_connection_send(connection, reply, NULL);
 		dbus_message_unref(reply);
 	}
+
+	wpa_dbus_flush_all_changed_properties(connection);
+
 	return DBUS_HANDLER_RESULT_HANDLED;
 }
 
@@ -456,6 +461,8 @@ void free_dbus_object_desc(struct wpa_dbus_object_desc *obj_dsc)
 	if (obj_dsc->user_data_free_func)
 		obj_dsc->user_data_free_func(obj_dsc->user_data);
 
+	os_free(obj_dsc->path);
+	os_free(obj_dsc->prop_changed_flags);
 	os_free(obj_dsc);
 }
 
@@ -489,6 +496,7 @@ int wpa_dbus_ctrl_iface_init(struct wpas_dbus_priv *iface,
 	};
 
 	obj_desc->connection = iface->con;
+	obj_desc->path = os_strdup(dbus_path);
 
 	/* Register the message handler for the global dbus interface */
 	if (!dbus_connection_register_object_path(iface->con,
@@ -556,6 +564,7 @@ int wpa_dbus_register_object_per_iface(
 
 	con = ctrl_iface->con;
 	obj_desc->connection = con;
+	obj_desc->path = os_strdup(path);
 
 	/* Register the message handler for the interface functions */
 	if (!dbus_connection_register_object_path(con, path, &vtable,
@@ -569,6 +578,9 @@ int wpa_dbus_register_object_per_iface(
 }
 
 
+static void flush_object_timeout_handler(void *eloop_ctx, void *timeout_ctx);
+
+
 /**
  * wpa_dbus_unregister_object_per_iface - Unregisters DBus object
  * @ctrl_iface: Pointer to dbus private data
@@ -581,6 +593,9 @@ int wpa_dbus_unregister_object_per_iface(
 	struct wpas_dbus_priv *ctrl_iface, const char *path)
 {
 	DBusConnection *con = ctrl_iface->con;
+
+	eloop_cancel_timeout(flush_object_timeout_handler, con, (void *) path);
+
 	if (!dbus_connection_unregister_object_path(con, path))
 		return -1;
 
@@ -588,77 +603,83 @@ int wpa_dbus_unregister_object_per_iface(
 }
 
 
-/**
+static void put_changed_properties(const struct wpa_dbus_object_desc *obj_dsc,
- * wpas_dbus_signal_network_added - Send a property changed signal
+				   const char *interface,
- * @iface: dbus priv struct
+				   DBusMessageIter *dict_iter)
- * @property_getter: propperty getter used to fetch new property value
- * @getter_arg: argument passed to property getter
- * @path: path to object which property has changed
- * @interface_name: signal and property interface
- * @property_name: name of property which has changed
- *
- * Notify listeners about changing value of some property. Signal
- * contains property name and its value fetched using given property
- * getter.
- */
-void wpa_dbus_signal_property_changed(struct wpas_dbus_priv *iface,
-				      WPADBusPropertyAccessor property_getter,
-				      void *getter_arg,
-				      const char *path,
-				      const char *interface_name,
-				      const char *property_name)
 {
+	DBusMessage *getter_reply;
+	DBusMessageIter prop_iter, entry_iter;
+	const struct wpa_dbus_property_desc *dsc;
+	int i;
 
-	DBusConnection *connection;
+	for (dsc = obj_dsc->properties, i = 0; dsc && dsc->dbus_property;
-	DBusMessage *msg, *getter_reply;
+	     dsc++, i++) {
-	DBusMessageIter prop_iter, signal_iter, dict_iter, entry_iter;
+		if (obj_dsc->prop_changed_flags == NULL ||
+		    !obj_dsc->prop_changed_flags[i])
+			continue;
+		if (os_strcmp(dsc->dbus_interface, interface) != 0)
+			continue;
+		obj_dsc->prop_changed_flags[i] = 0;
 
-	if (!iface)
+		getter_reply = dsc->getter(NULL, obj_dsc->user_data);
-		return;
+		if (!getter_reply ||
-	connection = iface->con;
+		    dbus_message_get_type(getter_reply) ==
+		    DBUS_MESSAGE_TYPE_ERROR) {
+			wpa_printf(MSG_ERROR, "dbus: %s: Cannot get new value "
+				   "of property %s", __func__,
+				   dsc->dbus_property);
+			continue;
+		}
 
-	if (!property_getter || !path || !interface_name || !property_name) {
+		if (!dbus_message_iter_init(getter_reply, &prop_iter) ||
-		wpa_printf(MSG_ERROR, "dbus: %s: A parameter not specified",
+		    !dbus_message_iter_open_container(dict_iter,
-			   __func__);
+						      DBUS_TYPE_DICT_ENTRY,
-		return;
+						      NULL, &entry_iter) ||
-	}
+		    !dbus_message_iter_append_basic(&entry_iter,
+						    DBUS_TYPE_STRING,
+						    &dsc->dbus_property))
+			goto err;
 
-	getter_reply = property_getter(NULL, getter_arg);
+		recursive_iter_copy(&prop_iter, &entry_iter);
-	if (!getter_reply ||
+
-	    dbus_message_get_type(getter_reply) == DBUS_MESSAGE_TYPE_ERROR) {
+		if (!dbus_message_iter_close_container(dict_iter, &entry_iter))
-		wpa_printf(MSG_ERROR, "dbus: %s: Cannot get new value of "
+			goto err;
-			   "property %s", __func__, property_name);
-		return;
-	}
 
-	msg = dbus_message_new_signal(path, interface_name,
-				      "PropertiesChanged");
-	if (msg == NULL) {
 		dbus_message_unref(getter_reply);
-		return;
 	}
 
-	dbus_message_iter_init(getter_reply, &prop_iter);
+	return;
+
+err:
+	wpa_printf(MSG_ERROR, "dbus: %s: Cannot construct signal", __func__);
+}
+
+
+static void send_prop_changed_signal(
+	DBusConnection *con, const char *path, const char *interface,
+	const struct wpa_dbus_object_desc *obj_dsc)
+{
+	DBusMessage *msg;
+	DBusMessageIter signal_iter, dict_iter;
+
+	msg = dbus_message_new_signal(path, interface, "PropertiesChanged");
+	if (msg == NULL)
+		return;
+
 	dbus_message_iter_init_append(msg, &signal_iter);
 
 	if (!dbus_message_iter_open_container(&signal_iter, DBUS_TYPE_ARRAY,
-					      "{sv}", &dict_iter) ||
+					      "{sv}", &dict_iter))
-	    !dbus_message_iter_open_container(&dict_iter, DBUS_TYPE_DICT_ENTRY,
-					      NULL, &entry_iter) ||
-	    !dbus_message_iter_append_basic(&entry_iter, DBUS_TYPE_STRING,
-					    &property_name))
 		goto err;
 
-	recursive_iter_copy(&prop_iter, &entry_iter);
+	put_changed_properties(obj_dsc, interface, &dict_iter);
 
-	if (!dbus_message_iter_close_container(&dict_iter, &entry_iter) ||
+	if (!dbus_message_iter_close_container(&signal_iter, &dict_iter))
-	    !dbus_message_iter_close_container(&signal_iter, &dict_iter))
 		goto err;
 
-	dbus_connection_send(connection, msg, NULL);
+	dbus_connection_send(con, msg, NULL);
 
 out:
-	dbus_message_unref(getter_reply);
 	dbus_message_unref(msg);
 	return;
 
@@ -669,6 +690,151 @@ err:
 }
 
 
+static void flush_object_timeout_handler(void *eloop_ctx, void *timeout_ctx)
+{
+	DBusConnection *con = eloop_ctx;
+	const char *path = timeout_ctx;
+
+	wpa_printf(MSG_DEBUG, "dbus: %s: Timeout - sending changed properties "
+		   "of object %s", __func__, path);
+	wpa_dbus_flush_object_changed_properties(con, path);
+}
+
+
+static void recursive_flush_changed_properties(DBusConnection *con,
+					       const char *path)
+{
+	char **objects = NULL;
+	char subobj_path[WPAS_DBUS_OBJECT_PATH_MAX];
+	int i;
+
+	wpa_dbus_flush_object_changed_properties(con, path);
+
+	if (!dbus_connection_list_registered(con, path, &objects))
+		goto out;
+
+	for (i = 0; objects[i]; i++) {
+		os_snprintf(subobj_path, WPAS_DBUS_OBJECT_PATH_MAX,
+			    "%s/%s", path, objects[i]);
+		recursive_flush_changed_properties(con, subobj_path);
+	}
+
+out:
+	dbus_free_string_array(objects);
+}
+
+
+/**
+ * wpa_dbus_flush_all_changed_properties - Send all PropertiesChanged signals
+ * @con: DBus connection
+ *
+ * Traverses through all registered objects and sends PropertiesChanged for
+ * each properties.
+ */
+void wpa_dbus_flush_all_changed_properties(DBusConnection *con)
+{
+	recursive_flush_changed_properties(con, WPAS_DBUS_NEW_PATH);
+}
+
+
+/**
+ * wpa_dbus_flush_object_changed_properties - Send PropertiesChanged for object
+ * @con: DBus connection
+ * @path: path to a DBus object for which PropertiesChanged will be sent.
+ *
+ * Iterates over all properties registered with object and for each interface
+ * containing properties marked as changed, sends a PropertiesChanged signal
+ * containing names and new values of properties that have changed.
+ *
+ * You need to call this function after wpa_dbus_mark_property_changed()
+ * if you want to send PropertiesChanged signal immediately (i.e., without
+ * waiting timeout to expire). PropertiesChanged signal for an object is sent
+ * automatically short time after first marking property as changed. All
+ * PropertiesChanged signals are sent automatically after responding on DBus
+ * message, so if you marked a property changed as a result of DBus call
+ * (e.g., param setter), you usually do not need to call this function.
+ */
+void wpa_dbus_flush_object_changed_properties(DBusConnection *con,
+					      const char *path)
+{
+	struct wpa_dbus_object_desc *obj_desc = NULL;
+	const struct wpa_dbus_property_desc *dsc;
+	int i;
+
+	eloop_cancel_timeout(flush_object_timeout_handler, con, (void *) path);
+
+	dbus_connection_get_object_path_data(con, path, (void **) &obj_desc);
+
+	if (!obj_desc)
+		return;
+
+	dsc = obj_desc->properties;
+	for (dsc = obj_desc->properties, i = 0; dsc && dsc->dbus_property;
+	     dsc++, i++) {
+		if (obj_desc->prop_changed_flags == NULL ||
+		    !obj_desc->prop_changed_flags[i])
+			continue;
+		send_prop_changed_signal(con, path, dsc->dbus_interface,
+					 obj_desc);
+	}
+}
+
+
+#define WPA_DBUS_SEND_PROP_CHANGED_TIMEOUT 5000
+
+
+/**
+ * wpa_dbus_mark_property_changed - Mark a property as changed and
+ * @iface: dbus priv struct
+ * @path: path to DBus object which property has changed
+ * @interface: interface containing changed property
+ * @property: property name which has changed
+ *
+ * Iterates over all properties registered with an object and marks the one
+ * given in parameters as changed. All parameters registered for an object
+ * within a single interface will be aggregated together and sent in one
+ * PropertiesChanged signal when function
+ * wpa_dbus_flush_object_changed_properties() is called.
+ */
+void wpa_dbus_mark_property_changed(struct wpas_dbus_priv *iface,
+				    const char *path, const char *interface,
+				    const char *property)
+{
+	struct wpa_dbus_object_desc *obj_desc = NULL;
+	const struct wpa_dbus_property_desc *dsc;
+	int i = 0;
+
+	dbus_connection_get_object_path_data(iface->con, path,
+					     (void **) &obj_desc);
+	if (!obj_desc) {
+		wpa_printf(MSG_ERROR, "dbus: wpa_dbus_property_changed: "
+			   "could not obtain object's private data: %s", path);
+		return;
+	}
+
+	for (dsc = obj_desc->properties; dsc && dsc->dbus_property; dsc++, i++)
+		if (os_strcmp(property, dsc->dbus_property) == 0 &&
+		    os_strcmp(interface, dsc->dbus_interface) == 0) {
+			if (obj_desc->prop_changed_flags)
+				obj_desc->prop_changed_flags[i] = 1;
+			break;
+		}
+
+	if (!dsc || !dsc->dbus_property) {
+		wpa_printf(MSG_ERROR, "dbus: wpa_dbus_property_changed: "
+			   "no property %s in object %s", property, path);
+		return;
+	}
+
+	if (!eloop_is_timeout_registered(flush_object_timeout_handler,
+					 iface->con, obj_desc->path)) {
+		eloop_register_timeout(0, WPA_DBUS_SEND_PROP_CHANGED_TIMEOUT,
+				       flush_object_timeout_handler,
+				       iface->con, obj_desc->path);
+	}
+}
+
+
 /**
  * wpa_dbus_get_object_properties - Put object's properties into dictionary
  * @iface: dbus priv struct

wpa_supplicant/dbus/dbus_new_helpers.h

@@ -27,12 +27,16 @@ typedef DBusMessage * (* WPADBusPropertyAccessor)(DBusMessage *message,
 
 struct wpa_dbus_object_desc {
 	DBusConnection *connection;
+	char *path;
 
 	/* list of methods, properties and signals registered with object */
 	const struct wpa_dbus_method_desc *methods;
 	const struct wpa_dbus_signal_desc *signals;
 	const struct wpa_dbus_property_desc *properties;
 
+	/* property changed flags */
+	u8 *prop_changed_flags;
+
 	/* argument for method handlers and properties
 	 * getter and setter functions */
 	void *user_data;
@@ -123,17 +127,20 @@ int wpa_dbus_unregister_object_per_iface(
 	struct wpas_dbus_priv *ctrl_iface,
 	const char *path);
 
-void wpa_dbus_signal_property_changed(struct wpas_dbus_priv *iface,
-				      WPADBusPropertyAccessor property_getter,
-				      void *getter_arg,
-				      const char *path,
-				      const char *interface_name,
-				      const char *property_name);
-
 void wpa_dbus_get_object_properties(struct wpas_dbus_priv *iface,
 				    const char *path, const char *interface,
 				    DBusMessageIter *dict_iter);
 
+
+void wpa_dbus_flush_all_changed_properties(DBusConnection *con);
+
+void wpa_dbus_flush_object_changed_properties(DBusConnection *con,
+					      const char *path);
+
+void wpa_dbus_mark_property_changed(struct wpas_dbus_priv *iface,
+				    const char *path, const char *interface,
+				    const char *property);
+
 DBusMessage * wpa_dbus_introspect(DBusMessage *message,
 				  struct wpa_dbus_object_desc *obj_dsc);