Skip to contentSkip to conversation

dbus: add _dbus_object_tree_set_interface_data

PATCH In review James Prestwood 2 participants 3 messages Aug 7, 2024 – Aug 8, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 dbus: add _dbus_object_tree_set_interface_data

This is to prep for l_dbus_object_set_data(), i.e. modifying the user_data of an existing dbus object.

---
 ell/dbus-private.h |  4 ++++
 ell/dbus-service.c | 33 +++++++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)
ell/dbus-private.h +4 -0
index fd5d099..0c06410 100644
@@ -207,6 +207,10 @@ bool _dbus_object_tree_remove_interface(struct _dbus_object_tree *tree,
 void *_dbus_object_tree_get_interface_data(struct _dbus_object_tree *tree,
 						const char *path,
 						const char *interface);
+bool _dbus_object_tree_set_interface_data(struct _dbus_object_tree *tree,
+						const char *path,
+						const char *interface,
+						void *user_data);
 
 void _dbus_object_tree_introspect(struct _dbus_object_tree *tree,
 					const char *path, struct l_string *buf);
ell/dbus-service.c +29 -4
index d4466de..0300bfe 100644
@@ -1568,25 +1568,50 @@ bool _dbus_object_tree_add_interface(struct _dbus_object_tree *tree,
 	return true;
 }
 
-void *_dbus_object_tree_get_interface_data(struct _dbus_object_tree *tree,
+static struct interface_instance *_dbus_object_tree_find_interface(
+						struct _dbus_object_tree *tree,
 						const char *path,
 						const char *interface)
 {
 	struct object_node *object;
-	struct interface_instance *instance;
 
 	object = l_hashmap_lookup(tree->objects, path);
 	if (!object)
 		return NULL;
 
-	instance = l_queue_find(object->instances, match_interface_instance,
-				(char *) interface);
+	return l_queue_find(object->instances, match_interface_instance,
+				interface);
+}
+
+void *_dbus_object_tree_get_interface_data(struct _dbus_object_tree *tree,
+						const char *path,
+						const char *interface)
+{
+	struct interface_instance *instance;
+
+	instance = _dbus_object_tree_find_interface(tree, path, interface);
 	if (!instance)
 		return NULL;
 
 	return instance->user_data;
 }
 
+bool _dbus_object_tree_set_interface_data(struct _dbus_object_tree *tree,
+						const char *path,
+						const char *interface,
+						void *user_data)
+{
+	struct interface_instance *instance;
+
+	instance = _dbus_object_tree_find_interface(tree, path, interface);
+	if (!instance)
+		return false;
+
+	instance->user_data = user_data;
+
+	return true;
+}
+
 static bool match_object_manager_path(const void *a, const void *b)
 {
 	const struct object_manager *manager = a;
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 dbus: add l_dbus_object_set_data()

Modifies the user data of an existing DBus object.

---
 ell/dbus.c  | 13 +++++++++++++
 ell/dbus.h  |  2 ++
 ell/ell.sym |  1 +
 3 files changed, 16 insertions(+)
ell/dbus.c +13 -0
index a1ce09e..cd14eef 100644
@@ -1694,6 +1694,19 @@ LIB_EXPORT void *l_dbus_object_get_data(struct l_dbus *dbus, const char *object,
 							interface);
 }
 
+LIB_EXPORT bool l_dbus_object_set_data(struct l_dbus *dbus, const char *object,
+				const char *interface, void *user_data)
+{
+	if (unlikely(!dbus))
+		return false;
+
+	if (unlikely(!dbus->tree))
+		return false;
+
+	return _dbus_object_tree_set_interface_data(dbus->tree, object,
+							interface, user_data);
+}
+
 LIB_EXPORT bool l_dbus_object_manager_enable(struct l_dbus *dbus,
 						const char *root)
 {
ell/dbus.h +2 -0
index 21bd4bf..6ec9c83 100644
@@ -227,6 +227,8 @@ bool l_dbus_object_remove_interface(struct l_dbus *dbus, const char *object,
 					const char *interface);
 void *l_dbus_object_get_data(struct l_dbus *dbus, const char *object,
 				const char *interface);
+bool l_dbus_object_set_data(struct l_dbus *dbus, const char *object,
+				const char *interface, void *user_data);
 
 bool l_dbus_object_manager_enable(struct l_dbus *dbus, const char *root);
 
ell/ell.sym +1 -0
index 0dad73f..aafc0a4 100644
@@ -225,6 +225,7 @@ global:
 	l_dbus_object_add_interface;
 	l_dbus_object_remove_interface;
 	l_dbus_object_get_data;
+        l_dbus_object_set_data;
 	l_dbus_object_manager_enable;
 	l_dbus_add_disconnect_watch;
 	l_dbus_add_service_watch;
Signature · 1 line
2.34.1
#2 lore raw

Re: [PATCH 2/2] dbus: add l_dbus_object_set_data()

Hi James,

Quoted 7 lines · James Prestwood

Modifies the user data of an existing DBus object.

---
  ell/dbus.c  | 13 +++++++++++++
  ell/dbus.h  |  2 ++
  ell/ell.sym |  1 +
  3 files changed, 16 insertions(+)

<snip>

ell/ell.sym global: · line 231

Quoted 12 lines
ell/ell.sym +1 -0
index 0dad73f..aafc0a4 100644
@@ -225,6 +225,7 @@ global:
  	l_dbus_object_add_interface;
  	l_dbus_object_remove_interface;
  	l_dbus_object_get_data;
+        l_dbus_object_set_data;
  	l_dbus_object_manager_enable;
  	l_dbus_add_disconnect_watch;
  	l_dbus_add_service_watch;

Seems we use tabs here, not spaces. I fixed that and applied both. Thanks.

Regards,
-Denis