luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

GDBusMessage: fast-path encoding of fixed arrays

Browse Source 
Instead of handling each item separately, handle the array as a whole.

https://bugzilla.gnome.org/show_bug.cgi?id=732754
This commit is contained in:
Ryan Lortie 2014-07-04 18:42:14 -04:00
parent f8d42cefbd
commit 958da1e9dc
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gio/gdbusmessage.c
View File

@ -2283,12 +2283,14 @@ append_value_to_blob (GVariant *value,
case 'a': /* G_VARIANT_TYPE_ARRAY */ case 'a': /* G_VARIANT_TYPE_ARRAY */
{ {
const GVariantType *element_type;
GVariant *item; GVariant *item;
GVariantIter iter; GVariantIter iter;
goffset array_len_offset; goffset array_len_offset;
goffset array_payload_begin_offset; goffset array_payload_begin_offset;
goffset cur_offset; goffset cur_offset;
gsize array_len; gsize array_len;
guint fixed_size;
padding_added = ensure_output_padding (mbuf, 4); padding_added = ensure_output_padding (mbuf, 4);
if (value != NULL) if (value != NULL)
@ -2312,17 +2314,34 @@ append_value_to_blob (GVariant *value,
*/ */
array_payload_begin_offset = mbuf->valid_len; array_payload_begin_offset = mbuf->valid_len;
element_type = g_variant_type_element (type);
fixed_size = get_type_fixed_size (element_type);
if (g_variant_n_children (value) == 0) if (g_variant_n_children (value) == 0)
{ {
gsize padding_added_for_item; gsize padding_added_for_item;
if (!append_value_to_blob (NULL, if (!append_value_to_blob (NULL,
g_variant_type_element (type), element_type,
mbuf, mbuf,
&padding_added_for_item, &padding_added_for_item,
error)) error))
goto fail; goto fail;
array_payload_begin_offset += padding_added_for_item; array_payload_begin_offset += padding_added_for_item;
} }
else if (fixed_size != 0)
{
GVariant *use_value;
if (g_memory_buffer_is_byteswapped (mbuf))
use_value = g_variant_byteswap (value);
else
use_value = g_variant_ref (value);
ensure_output_padding (mbuf, fixed_size);
array_len = g_variant_get_size (use_value);
g_memory_buffer_write (mbuf, g_variant_get_data (use_value), array_len);
g_variant_unref (use_value);
}
else else
{ {
guint n; guint n;