luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-04 00:13:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdbus-codegen: Define only one marshaller per signature reusing across interfaces

Browse Source 
Avoid generating more code than needed, so other than continuing using
the generic glib marshallers when possible, define once the custom ones
we need for each file we generate.

The marshallers are then re-used across all the interfaces defined
without duplicating the code size.
This commit is contained in:
Marco Trevisan (Treviño)
2023-06-30 22:35:20 +02:00
parent 23180d433e
commit 27b7559c91
3 changed files with 102 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
gio/tests/codegen.py
View File

@@ -994,10 +994,20 @@ G_END_DECLS
self.assertIs(stripped_out.count(f"{func_name} ("), 1)
self.assertIs(
stripped_out.count("g_marshal_value_peek_object (param_values + 1)"), 2
stripped_out.count("g_marshal_value_peek_object (param_values + 1)"), 1
)
self.assertIs(
stripped_out.count("g_value_set_boolean (return_value, v_return);"), 2
stripped_out.count("g_value_set_boolean (return_value, v_return);"), 1
)
self.assertIs(
stripped_out.count(
"_g_dbus_codegen_marshal_BOOLEAN__OBJECT (\n GClosure"
),
1,
)
self.assertIs(
stripped_out.count("_g_dbus_codegen_marshal_BOOLEAN__OBJECT (closure"), 2
)
@unittest.skipIf(on_win32(), "requires /dev/stdout")
@@ -1087,6 +1097,14 @@ G_END_DECLS
<method name="MethodWithManyArgs">
{''.join(generated_args)}
</method>
<method name="SameMethodWithManyArgs">
{''.join(generated_args)}
</method>
</interface>
<interface name="org.project.OtherCallableIface">
<method name="MethodWithManyArgs">
{''.join(generated_args)}
</method>
</interface>
</node>"""
@@ -1121,6 +1139,18 @@ G_END_DECLS
self.assertIs(
stripped_out.count("g_value_set_boolean (return_value, v_return);"), 1
)
func_types = "_".join(
[p["value_type"].upper() for p in self.ARGUMENTS_TYPES.values()]
)
func_name = f"_g_dbus_codegen_marshal_BOOLEAN__OBJECT_{func_types}"
self.assertIs(stripped_out.count(f"{func_name} (\n GClosure"), 1)
self.assertIs(stripped_out.count(f"{func_name} (closure"), 3)
func_name = (
f"org_project_other_callable_iface_method_marshal_method_with_many_args"
)
self.assertIs(stripped_out.count(f"{func_name},"), 1)
self.assertIs(stripped_out.count(f"{func_name} ("), 1)
@unittest.skipIf(on_win32(), "requires /dev/stdout")
def test_generate_methods_marshallers_multiple_out_args(self):
@@ -1165,6 +1195,11 @@ G_END_DECLS
stripped_out.count("g_value_set_boolean (return_value, v_return);"), 1
)
self.assertIs(
stripped_out.count("_g_dbus_codegen_marshal_BOOLEAN__OBJECT (closure"),
1,
)
@unittest.skipIf(on_win32(), "requires /dev/stdout")
def test_generate_methods_marshallers_with_unix_fds(self):
"""Test an interface with `h` arguments"""