mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-23 03:48:07 +02:00
* tools/Makefile.am: Kill of print-introspect in favor of using dbus-send --print-reply=literal. * tools/print-introspect.c: Deleted. * test/glib/test-service-glib.xml: * test/glib/test-service-glib.c (my_object_get_objs): New test for "ao". * test/glib/test-dbus-glib.c (echo_received_cb): Free echo data. (main): Test GetObjs. * glib/examples/statemachine/Makefile.am: * glib/examples/statemachine/sm-marshal.list: * glib/examples/statemachine/statemachine-client.c: * glib/examples/statemachine/statemachine-server.c: * glib/examples/statemachine/statemachine-server.xml: * glib/examples/statemachine/statemachine.c: * glib/examples/statemachine/statemachine.h: * glib/examples/statemachine/statemachine.xml: New example. * glib/examples/example-service.c (main): Move invocation of dbus_g_object_type_install_info earlier, to emphasize it should only be done once. * glib/examples/example-signal-emitter.c (main): Ditto. * glib/examples/Makefile.am (SUBDIRS): Include statemachine. * glib/dbus-gvalue.h (dbus_gtype_to_signature) (dbus_gvalue_marshal): Update prototypes. * glib/dbus-gvalue.c: Update all marshalling functions to take const GValue instead of GValue. (signature_iter_to_g_type_array): Return a GPtrArray for nonfixed types. (dbus_gvalue_to_signature): Update for dbus_gtype_to_signature change. (dbus_gtype_to_signature): Handle generic collecitons and maps. Return a newly-allocated string. (demarshal_proxy, demarshal_object_path, demarshal_object) (demarshal_strv, demarshal_ghashtable): Set error, don't assert if we get the wrong types from message. (get_type_demarshaller): New function, extracted from dbus_gvalue_demarshal. (demarshal_collection): New function, demarshals generic collection. (dbus_gvalue_demarshal): Just invoke result of get_type_demarshaller. Throw error if we don't have one. (marshal_garray_basic): Abort on OOM. (get_type_marshaller): New function, extracted from dbus_gvalue_marshal. (collection_marshal_iterator, marshal_collection): New functions; implements generic marshalling for an iteratable specialized collection. (dbus_gvalue_marshal): Just invoke result of get_type_marshaller. * glib/dbus-gvalue-utils.c (gvalue_from_ptrarray_value): Handle G_TYPE_STRING. (ptrarray_value_from_gvalue): Ditto. (ptrarray_append, ptrarray_free): New functions. (slist_constructor, slist_iterator, slist_copy_elt, slist_copy) (slist_append, slist_end_append, slist_free): New functions. (dbus_g_type_specialized_builtins_init): Add append fuctions for GPtrArray and GSList. Register GSList. (test_specialized_hash, _dbus_gvalue_utils_test): New functions. * glib/dbus-gtype-specialized.h (DBusGTypeSpecializedAppendContext): New. (dbus_g_type_specialized_collection_init_append) (dbus_g_type_specialized_collection_append) (dbus_g_type_specialized_collection_end_append): Prototype. (DBusGTypeSpecializedCollectionVtable): Add append_func and end_append_func. * glib/dbus-gtype-specialized.c (dbus_g_type_specialized_collection_init_append) (dbus_g_type_specialized_collection_append) (dbus_g_type_specialized_collection_end_append): New functions. (dbus_g_type_map_value_iterate): Take const GValue. (dbus_g_type_collection_value_iterate): Ditto. * glib/dbus-gtest.c (dbus_glib_internal_do_not_use_run_tests): Run _dbus_gvalue_utils_test. * glib/dbus-gtest.h: Prototype it. * glib/dbus-gproxy.c (dbus_g_proxy_manager_filter): Avoid using uninitialized owner_list. (dbus_g_proxy_begin_call_internal): Move return_if_fail to public API. (dbus_g_proxy_end_call_internal): Update to use error set from dbus_gvalue_demarshal instead of setting it here. (dbus_g_proxy_begin_call): Move return_if_fail here. * glib/dbus-gobject.c (write_interface): Update for dbus_gtype_to_signature returning new string. * configure.in: Add glib/examples/statemachine.
958 lines
23 KiB
C
958 lines
23 KiB
C
/* -*- mode: C; c-file-style: "gnu" -*- */
|
|
/* dbus-gvalue-utils.c: Non-DBus-specific functions related to GType/GValue
|
|
*
|
|
* Copyright (C) 2005 Red Hat, Inc.
|
|
*
|
|
* Licensed under the Academic Free License version 2.1
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include "dbus/dbus-glib.h"
|
|
#include "dbus-gvalue-utils.h"
|
|
#include "dbus-gtest.h"
|
|
#include <glib.h>
|
|
#include <string.h>
|
|
#include <gobject/gvaluecollector.h>
|
|
|
|
|
|
static guint
|
|
fixed_type_get_size (GType type)
|
|
{
|
|
switch (type)
|
|
{
|
|
case G_TYPE_CHAR:
|
|
case G_TYPE_UCHAR:
|
|
return sizeof (gchar);
|
|
case G_TYPE_BOOLEAN:
|
|
return sizeof (gboolean);
|
|
case G_TYPE_LONG:
|
|
case G_TYPE_ULONG:
|
|
return sizeof (glong);
|
|
case G_TYPE_INT:
|
|
case G_TYPE_UINT:
|
|
return sizeof (gint);
|
|
case G_TYPE_INT64:
|
|
case G_TYPE_UINT64:
|
|
return sizeof (gint64);
|
|
case G_TYPE_FLOAT:
|
|
return sizeof (gfloat);
|
|
case G_TYPE_DOUBLE:
|
|
return sizeof (gdouble);
|
|
default:
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
gboolean
|
|
dbus_g_type_is_fixed (GType type)
|
|
{
|
|
return fixed_type_get_size (type) > 0;
|
|
}
|
|
|
|
guint
|
|
dbus_g_type_fixed_get_size (GType type)
|
|
{
|
|
g_assert (dbus_g_type_is_fixed (type));
|
|
return fixed_type_get_size (type);
|
|
}
|
|
|
|
gboolean
|
|
dbus_gvalue_store (GValue *value,
|
|
gpointer storage)
|
|
{
|
|
/* FIXME - can we use the GValue lcopy_value method
|
|
* to do this in a cleaner way?
|
|
*/
|
|
switch (g_type_fundamental (G_VALUE_TYPE (value)))
|
|
{
|
|
case G_TYPE_CHAR:
|
|
*((gchar *) storage) = g_value_get_char (value);
|
|
return TRUE;
|
|
case G_TYPE_UCHAR:
|
|
*((guchar *) storage) = g_value_get_uchar (value);
|
|
return TRUE;
|
|
case G_TYPE_BOOLEAN:
|
|
*((gboolean *) storage) = g_value_get_boolean (value);
|
|
return TRUE;
|
|
case G_TYPE_LONG:
|
|
*((glong *) storage) = g_value_get_long (value);
|
|
return TRUE;
|
|
case G_TYPE_ULONG:
|
|
*((gulong *) storage) = g_value_get_ulong (value);
|
|
return TRUE;
|
|
case G_TYPE_INT:
|
|
*((gint *) storage) = g_value_get_int (value);
|
|
return TRUE;
|
|
case G_TYPE_UINT:
|
|
*((guint *) storage) = g_value_get_uint (value);
|
|
return TRUE;
|
|
case G_TYPE_INT64:
|
|
*((gint64 *) storage) = g_value_get_int64 (value);
|
|
return TRUE;
|
|
case G_TYPE_UINT64:
|
|
*((guint64 *) storage) = g_value_get_uint64 (value);
|
|
return TRUE;
|
|
case G_TYPE_DOUBLE:
|
|
*((gdouble *) storage) = g_value_get_double (value);
|
|
return TRUE;
|
|
case G_TYPE_STRING:
|
|
*((gchar **) storage) = (char*) g_value_get_string (value);
|
|
return TRUE;
|
|
case G_TYPE_POINTER:
|
|
*((gpointer *) storage) = g_value_get_pointer (value);
|
|
return TRUE;
|
|
case G_TYPE_OBJECT:
|
|
*((gpointer *) storage) = g_value_get_object (value);
|
|
return TRUE;
|
|
case G_TYPE_BOXED:
|
|
*((gpointer *) storage) = g_value_get_boxed (value);
|
|
return TRUE;
|
|
default:
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
gboolean
|
|
dbus_gvalue_set_from_pointer (GValue *value,
|
|
gconstpointer storage)
|
|
{
|
|
/* FIXME - is there a better way to do this? */
|
|
switch (g_type_fundamental (G_VALUE_TYPE (value)))
|
|
{
|
|
case G_TYPE_CHAR:
|
|
g_value_set_char (value, *((gchar *) storage));
|
|
return TRUE;
|
|
case G_TYPE_UCHAR:
|
|
g_value_set_uchar (value, *((guchar *) storage));
|
|
return TRUE;
|
|
case G_TYPE_BOOLEAN:
|
|
g_value_set_boolean (value, *((gboolean *) storage));
|
|
return TRUE;
|
|
case G_TYPE_LONG:
|
|
g_value_set_long (value, *((glong *) storage));
|
|
return TRUE;
|
|
case G_TYPE_ULONG:
|
|
g_value_set_ulong (value, *((gulong *) storage));
|
|
return TRUE;
|
|
case G_TYPE_INT:
|
|
g_value_set_int (value, *((gint *) storage));
|
|
return TRUE;
|
|
case G_TYPE_UINT:
|
|
g_value_set_uint (value, *((guint *) storage));
|
|
return TRUE;
|
|
case G_TYPE_INT64:
|
|
g_value_set_int64 (value, *((gint64 *) storage));
|
|
return TRUE;
|
|
case G_TYPE_UINT64:
|
|
g_value_set_uint64 (value, *((guint64 *) storage));
|
|
return TRUE;
|
|
case G_TYPE_DOUBLE:
|
|
g_value_set_double (value, *((gdouble *) storage));
|
|
return TRUE;
|
|
case G_TYPE_STRING:
|
|
g_value_set_string (value, *((gchar **) storage));
|
|
return TRUE;
|
|
case G_TYPE_POINTER:
|
|
g_value_set_pointer (value, *((gpointer *) storage));
|
|
return TRUE;
|
|
case G_TYPE_OBJECT:
|
|
g_value_set_object (value, *((gpointer *) storage));
|
|
return TRUE;
|
|
case G_TYPE_BOXED:
|
|
g_value_set_boxed (value, *((gpointer *) storage));
|
|
return TRUE;
|
|
default:
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
gboolean
|
|
dbus_gvalue_take (GValue *value,
|
|
GTypeCValue *cvalue)
|
|
{
|
|
GType g_type;
|
|
GTypeValueTable *value_table;
|
|
char *error_msg;
|
|
|
|
g_type = G_VALUE_TYPE (value);
|
|
value_table = g_type_value_table_peek (g_type);
|
|
|
|
error_msg = value_table->collect_value (value, 1, cvalue, G_VALUE_NOCOPY_CONTENTS);
|
|
if (error_msg)
|
|
{
|
|
g_warning ("%s: %s", G_STRLOC, error_msg);
|
|
g_free (error_msg);
|
|
return FALSE;
|
|
}
|
|
/* Clear the NOCOPY_CONTENTS flag; we want to take ownership
|
|
* of the value.
|
|
*/
|
|
value->data[1].v_uint &= ~(G_VALUE_NOCOPY_CONTENTS);
|
|
return TRUE;
|
|
}
|
|
|
|
static gboolean
|
|
hash_func_from_gtype (GType gtype, GHashFunc *func)
|
|
{
|
|
switch (gtype)
|
|
{
|
|
case G_TYPE_CHAR:
|
|
case G_TYPE_UCHAR:
|
|
case G_TYPE_BOOLEAN:
|
|
case G_TYPE_INT:
|
|
case G_TYPE_UINT:
|
|
*func = NULL;
|
|
return TRUE;
|
|
case G_TYPE_STRING:
|
|
*func = g_str_hash;
|
|
return TRUE;
|
|
default:
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
static gboolean
|
|
hash_free_from_gtype (GType gtype, GDestroyNotify *func)
|
|
{
|
|
switch (gtype)
|
|
{
|
|
case G_TYPE_CHAR:
|
|
case G_TYPE_UCHAR:
|
|
case G_TYPE_BOOLEAN:
|
|
case G_TYPE_INT:
|
|
case G_TYPE_UINT:
|
|
*func = NULL;
|
|
return TRUE;
|
|
case G_TYPE_STRING:
|
|
*func = g_free;
|
|
return TRUE;
|
|
default:
|
|
if (gtype == G_TYPE_VALUE)
|
|
{
|
|
*func = (GDestroyNotify) g_value_unset;
|
|
return TRUE;
|
|
}
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
gboolean
|
|
dbus_gtype_is_valid_hash_key (GType type)
|
|
{
|
|
GHashFunc func;
|
|
return hash_func_from_gtype (type, &func);
|
|
}
|
|
|
|
gboolean
|
|
dbus_gtype_is_valid_hash_value (GType type)
|
|
{
|
|
GDestroyNotify func;
|
|
return hash_free_from_gtype (type, &func);
|
|
}
|
|
|
|
GHashFunc
|
|
dbus_g_hash_func_from_gtype (GType gtype)
|
|
{
|
|
GHashFunc func;
|
|
gboolean ret;
|
|
ret = hash_func_from_gtype (gtype, &func);
|
|
g_assert (ret != FALSE);
|
|
return func;
|
|
}
|
|
|
|
GEqualFunc
|
|
dbus_g_hash_equal_from_gtype (GType gtype)
|
|
{
|
|
g_assert (dbus_gtype_is_valid_hash_key (gtype));
|
|
|
|
switch (gtype)
|
|
{
|
|
case G_TYPE_CHAR:
|
|
case G_TYPE_UCHAR:
|
|
case G_TYPE_BOOLEAN:
|
|
case G_TYPE_INT:
|
|
case G_TYPE_UINT:
|
|
return NULL;
|
|
case G_TYPE_STRING:
|
|
return g_str_equal;
|
|
default:
|
|
g_assert_not_reached ();
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
GDestroyNotify
|
|
dbus_g_hash_free_from_gtype (GType gtype)
|
|
{
|
|
GDestroyNotify func;
|
|
gboolean ret;
|
|
ret = hash_free_from_gtype (gtype, &func);
|
|
g_assert (ret != FALSE);
|
|
return func;
|
|
}
|
|
|
|
static void
|
|
gvalue_from_hash_value (GValue *value, gpointer instance)
|
|
{
|
|
switch (g_type_fundamental (G_VALUE_TYPE (value)))
|
|
{
|
|
case G_TYPE_CHAR:
|
|
g_value_set_char (value, (gchar) GPOINTER_TO_INT (instance));
|
|
break;
|
|
case G_TYPE_UCHAR:
|
|
g_value_set_uchar (value, (guchar) GPOINTER_TO_UINT (instance));
|
|
break;
|
|
case G_TYPE_BOOLEAN:
|
|
g_value_set_boolean (value, (gboolean) GPOINTER_TO_UINT (instance));
|
|
break;
|
|
case G_TYPE_INT:
|
|
g_value_set_int (value, GPOINTER_TO_INT (instance));
|
|
break;
|
|
case G_TYPE_UINT:
|
|
g_value_set_uint (value, GPOINTER_TO_UINT (instance));
|
|
break;
|
|
case G_TYPE_STRING:
|
|
g_value_set_static_string (value, instance);
|
|
break;
|
|
case G_TYPE_POINTER:
|
|
g_value_set_pointer (value, instance);
|
|
break;
|
|
case G_TYPE_BOXED:
|
|
g_value_set_static_boxed (value, instance);
|
|
break;
|
|
case G_TYPE_OBJECT:
|
|
g_value_set_object (value, instance);
|
|
g_object_unref (g_value_get_object (value));
|
|
break;
|
|
default:
|
|
g_assert_not_reached ();
|
|
break;
|
|
}
|
|
}
|
|
|
|
static gpointer
|
|
hash_value_from_gvalue (GValue *value)
|
|
{
|
|
switch (g_type_fundamental (G_VALUE_TYPE (value)))
|
|
{
|
|
case G_TYPE_CHAR:
|
|
return GINT_TO_POINTER ((int) g_value_get_char (value));
|
|
break;
|
|
case G_TYPE_UCHAR:
|
|
return GUINT_TO_POINTER ((guint) g_value_get_uchar (value));
|
|
break;
|
|
case G_TYPE_BOOLEAN:
|
|
return GUINT_TO_POINTER ((guint) g_value_get_boolean (value));
|
|
break;
|
|
case G_TYPE_INT:
|
|
return GINT_TO_POINTER (g_value_get_int (value));
|
|
break;
|
|
case G_TYPE_UINT:
|
|
return GUINT_TO_POINTER (g_value_get_uint (value));
|
|
break;
|
|
case G_TYPE_STRING:
|
|
return (gpointer) g_value_get_string (value);
|
|
break;
|
|
case G_TYPE_POINTER:
|
|
return g_value_get_pointer (value);
|
|
break;
|
|
case G_TYPE_BOXED:
|
|
return g_value_get_boxed (value);
|
|
break;
|
|
case G_TYPE_OBJECT:
|
|
return g_value_get_object (value);
|
|
break;
|
|
default:
|
|
g_assert_not_reached ();
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
struct DBusGHashTableValueForeachData
|
|
{
|
|
DBusGTypeSpecializedMapIterator func;
|
|
GType key_type;
|
|
GType value_type;
|
|
gpointer data;
|
|
};
|
|
|
|
static void
|
|
hashtable_foreach_with_values (gpointer key, gpointer value, gpointer user_data)
|
|
{
|
|
GValue key_val = {0, };
|
|
GValue value_val = {0, };
|
|
struct DBusGHashTableValueForeachData *data = user_data;
|
|
|
|
g_value_init (&key_val, data->key_type);
|
|
g_value_init (&value_val, data->value_type);
|
|
gvalue_from_hash_value (&key_val, key);
|
|
gvalue_from_hash_value (&value_val, value);
|
|
|
|
data->func (&key_val, &value_val, data->data);
|
|
}
|
|
|
|
|
|
static void
|
|
hashtable_iterator (GType hash_type,
|
|
gpointer instance,
|
|
DBusGTypeSpecializedMapIterator iterator,
|
|
gpointer user_data)
|
|
{
|
|
struct DBusGHashTableValueForeachData data;
|
|
GType key_gtype;
|
|
GType value_gtype;
|
|
|
|
key_gtype = dbus_g_type_get_map_key_specialization (hash_type);
|
|
value_gtype = dbus_g_type_get_map_value_specialization (hash_type);
|
|
|
|
data.func = iterator;
|
|
data.key_type = key_gtype;
|
|
data.value_type = value_gtype;
|
|
data.data = user_data;
|
|
|
|
g_hash_table_foreach (instance, hashtable_foreach_with_values, &data);
|
|
}
|
|
|
|
void
|
|
dbus_g_hash_table_insert_steal_values (GHashTable *table,
|
|
GValue *key_val,
|
|
GValue *value_val)
|
|
{
|
|
gpointer key, val;
|
|
|
|
key = hash_value_from_gvalue (key_val);
|
|
val = hash_value_from_gvalue (value_val);
|
|
|
|
g_hash_table_insert (table, key, val);
|
|
}
|
|
|
|
static gpointer
|
|
hashtable_constructor (GType type)
|
|
{
|
|
GHashTable *ret;
|
|
GType key_gtype;
|
|
GType value_gtype;
|
|
|
|
key_gtype = dbus_g_type_get_map_key_specialization (type);
|
|
value_gtype = dbus_g_type_get_map_value_specialization (type);
|
|
|
|
ret = g_hash_table_new_full (dbus_g_hash_func_from_gtype (key_gtype),
|
|
dbus_g_hash_equal_from_gtype (key_gtype),
|
|
dbus_g_hash_free_from_gtype (key_gtype),
|
|
dbus_g_hash_free_from_gtype (value_gtype));
|
|
return ret;
|
|
}
|
|
|
|
static void
|
|
hashtable_insert_values (GHashTable *table,
|
|
const GValue *key_val,
|
|
const GValue *value_val)
|
|
{
|
|
GValue key_copy = {0, };
|
|
GValue value_copy = {0, };
|
|
|
|
g_value_init (&key_copy, G_VALUE_TYPE (key_val));
|
|
g_value_copy (key_val, &key_copy);
|
|
g_value_init (&value_copy, G_VALUE_TYPE (value_val));
|
|
g_value_copy (value_val, &value_copy);
|
|
|
|
dbus_g_hash_table_insert_steal_values (table, &key_copy, &value_copy);
|
|
}
|
|
|
|
static void
|
|
hashtable_foreach_copy (const GValue *key, const GValue *val, gpointer data)
|
|
{
|
|
hashtable_insert_values ((GHashTable *) data, key, val);
|
|
}
|
|
|
|
static gpointer
|
|
hashtable_copy (GType type, gpointer src)
|
|
{
|
|
GHashTable *ghash;
|
|
GHashTable *ret;
|
|
GValue hashval = {0,};
|
|
|
|
ghash = src;
|
|
|
|
ret = hashtable_constructor (type);
|
|
|
|
g_value_init (&hashval, type);
|
|
g_value_set_static_boxed (&hashval, ghash);
|
|
dbus_g_type_map_value_iterate (&hashval, hashtable_foreach_copy, ret);
|
|
return ret;
|
|
}
|
|
|
|
static void
|
|
hashtable_free (GType type, gpointer val)
|
|
{
|
|
g_hash_table_destroy (val);
|
|
}
|
|
|
|
static gpointer
|
|
array_constructor (GType type)
|
|
{
|
|
GArray *array;
|
|
guint elt_size;
|
|
GType elt_type;
|
|
gboolean zero_terminated;
|
|
gboolean clear;
|
|
|
|
elt_type = dbus_g_type_get_collection_specialization (type);
|
|
g_assert (elt_type != G_TYPE_INVALID);
|
|
|
|
elt_size = dbus_g_type_fixed_get_size (elt_type);
|
|
|
|
/* These are "safe" defaults */
|
|
zero_terminated = TRUE; /* ((struct _DBusGRealArray*) garray)->zero_terminated; */
|
|
clear = TRUE; /* ((struct _DBusGRealArray*) garray)->clear; */
|
|
|
|
array = g_array_new (zero_terminated, clear, elt_size);
|
|
return array;
|
|
}
|
|
|
|
static gpointer
|
|
array_copy (GType type, gpointer src)
|
|
{
|
|
GArray *garray;
|
|
GArray *new;
|
|
|
|
garray = src;
|
|
|
|
new = array_constructor (type);
|
|
g_array_append_vals (new, garray->data, garray->len);
|
|
|
|
return new;
|
|
}
|
|
|
|
static void
|
|
array_free (GType type, gpointer val)
|
|
{
|
|
GArray *array;
|
|
array = val;
|
|
g_array_free (array, TRUE);
|
|
}
|
|
|
|
static gboolean
|
|
array_fixed_accessor (GType type, gpointer instance, gpointer *values, guint *len)
|
|
{
|
|
GType elt_type;
|
|
GArray *array = instance;
|
|
|
|
elt_type = dbus_g_type_get_collection_specialization (type);
|
|
if (!dbus_g_type_is_fixed (elt_type))
|
|
return FALSE;
|
|
|
|
*values = array->data;
|
|
*len = array->len;
|
|
return TRUE;
|
|
}
|
|
|
|
static gpointer
|
|
ptrarray_constructor (GType type)
|
|
{
|
|
/* Later we should determine a destructor, need g_ptr_array_destroy */
|
|
return g_ptr_array_new ();
|
|
}
|
|
|
|
static void
|
|
gvalue_from_ptrarray_value (GValue *value, gpointer instance)
|
|
{
|
|
switch (g_type_fundamental (G_VALUE_TYPE (value)))
|
|
{
|
|
case G_TYPE_STRING:
|
|
g_value_set_string (value, instance);
|
|
break;
|
|
case G_TYPE_POINTER:
|
|
g_value_set_pointer (value, instance);
|
|
break;
|
|
case G_TYPE_BOXED:
|
|
g_value_set_static_boxed (value, instance);
|
|
break;
|
|
case G_TYPE_OBJECT:
|
|
g_value_set_object (value, instance);
|
|
g_object_unref (g_value_get_object (value));
|
|
break;
|
|
default:
|
|
g_assert_not_reached ();
|
|
break;
|
|
}
|
|
}
|
|
|
|
static gpointer
|
|
ptrarray_value_from_gvalue (const GValue *value)
|
|
{
|
|
switch (g_type_fundamental (G_VALUE_TYPE (value)))
|
|
{
|
|
case G_TYPE_STRING:
|
|
return (gpointer) g_value_get_string (value);
|
|
break;
|
|
case G_TYPE_POINTER:
|
|
return g_value_get_pointer (value);
|
|
break;
|
|
case G_TYPE_BOXED:
|
|
return g_value_get_boxed (value);
|
|
break;
|
|
case G_TYPE_OBJECT:
|
|
return g_value_get_object (value);
|
|
break;
|
|
default:
|
|
g_assert_not_reached ();
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
static void
|
|
ptrarray_iterator (GType hash_type,
|
|
gpointer instance,
|
|
DBusGTypeSpecializedCollectionIterator iterator,
|
|
gpointer user_data)
|
|
{
|
|
GPtrArray *ptrarray;
|
|
GType elt_gtype;
|
|
guint i;
|
|
|
|
ptrarray = instance;
|
|
|
|
elt_gtype = dbus_g_type_get_collection_specialization (hash_type);
|
|
|
|
for (i = 0; i < ptrarray->len; i++)
|
|
{
|
|
GValue val = {0, };
|
|
g_value_init (&val, elt_gtype);
|
|
gvalue_from_ptrarray_value (&val, g_ptr_array_index (ptrarray, i));
|
|
iterator (&val, user_data);
|
|
}
|
|
}
|
|
|
|
static void
|
|
ptrarray_copy_elt (const GValue *val, gpointer user_data)
|
|
{
|
|
GPtrArray *dest = user_data;
|
|
GValue val_copy = {0, };
|
|
|
|
g_value_init (&val_copy, G_VALUE_TYPE (val));
|
|
g_value_copy (val, &val_copy);
|
|
|
|
g_ptr_array_add (dest, ptrarray_value_from_gvalue (&val_copy));
|
|
}
|
|
|
|
static gpointer
|
|
ptrarray_copy (GType type, gpointer src)
|
|
{
|
|
GPtrArray *new;
|
|
GValue array_val = {0, };
|
|
|
|
g_value_init (&array_val, type);
|
|
g_value_set_static_boxed (&array_val, src);
|
|
|
|
new = ptrarray_constructor (type);
|
|
dbus_g_type_collection_value_iterate (&array_val, ptrarray_copy_elt, new);
|
|
|
|
return new;
|
|
}
|
|
|
|
static void
|
|
ptrarray_append (DBusGTypeSpecializedAppendContext *ctx, const GValue *value)
|
|
{
|
|
GPtrArray *array;
|
|
|
|
array = g_value_get_boxed (ctx->val);
|
|
|
|
g_ptr_array_add (array, ptrarray_value_from_gvalue (value));
|
|
}
|
|
|
|
static void
|
|
ptrarray_free (GType type, gpointer val)
|
|
{
|
|
GPtrArray *array;
|
|
array = val;
|
|
g_ptr_array_free (array, TRUE);
|
|
}
|
|
|
|
static gpointer
|
|
slist_constructor (GType type)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static void
|
|
slist_iterator (GType list_type,
|
|
gpointer instance,
|
|
DBusGTypeSpecializedCollectionIterator iterator,
|
|
gpointer user_data)
|
|
{
|
|
GSList *slist;
|
|
GType elt_gtype;
|
|
|
|
slist = instance;
|
|
|
|
elt_gtype = dbus_g_type_get_collection_specialization (list_type);
|
|
|
|
while (slist != NULL)
|
|
{
|
|
GValue val = {0, };
|
|
g_value_init (&val, elt_gtype);
|
|
gvalue_from_ptrarray_value (&val, slist->data);
|
|
iterator (&val, user_data);
|
|
}
|
|
}
|
|
|
|
static void
|
|
slist_copy_elt (const GValue *val, gpointer user_data)
|
|
{
|
|
GSList *dest = user_data;
|
|
GValue val_copy = {0, };
|
|
|
|
g_value_init (&val_copy, G_VALUE_TYPE (val));
|
|
g_value_copy (val, &val_copy);
|
|
|
|
g_slist_append (dest, ptrarray_value_from_gvalue (&val_copy));
|
|
}
|
|
|
|
static gpointer
|
|
slist_copy (GType type, gpointer src)
|
|
{
|
|
GSList *new;
|
|
GValue slist_val = {0, };
|
|
|
|
g_value_init (&slist_val, type);
|
|
g_value_set_static_boxed (&slist_val, src);
|
|
|
|
new = slist_constructor (type);
|
|
dbus_g_type_collection_value_iterate (&slist_val, slist_copy_elt, new);
|
|
|
|
return new;
|
|
}
|
|
|
|
static void
|
|
slist_append (DBusGTypeSpecializedAppendContext *ctx, const GValue *value)
|
|
{
|
|
GSList *list;
|
|
|
|
list = g_value_get_boxed (ctx->val);
|
|
list = g_slist_prepend (list, ptrarray_value_from_gvalue (value));
|
|
g_value_set_static_boxed (ctx->val, list);
|
|
}
|
|
|
|
static void
|
|
slist_end_append (DBusGTypeSpecializedAppendContext *ctx)
|
|
{
|
|
GSList *list;
|
|
|
|
list = g_value_get_boxed (ctx->val);
|
|
list = g_slist_reverse (list);
|
|
|
|
g_value_set_static_boxed (ctx->val, list);
|
|
}
|
|
|
|
static void
|
|
slist_free (GType type, gpointer val)
|
|
{
|
|
GSList *list;
|
|
list = val;
|
|
g_slist_free (list);
|
|
}
|
|
|
|
void
|
|
dbus_g_type_specialized_builtins_init (void)
|
|
{
|
|
static const DBusGTypeSpecializedCollectionVtable array_vtable = {
|
|
{
|
|
array_constructor,
|
|
array_free,
|
|
array_copy,
|
|
},
|
|
array_fixed_accessor,
|
|
NULL,
|
|
NULL,
|
|
NULL
|
|
};
|
|
|
|
dbus_g_type_register_collection ("GArray", &array_vtable, 0);
|
|
|
|
static const DBusGTypeSpecializedCollectionVtable ptrarray_vtable = {
|
|
{
|
|
ptrarray_constructor,
|
|
ptrarray_free,
|
|
ptrarray_copy,
|
|
},
|
|
NULL,
|
|
ptrarray_iterator,
|
|
ptrarray_append,
|
|
NULL,
|
|
};
|
|
|
|
dbus_g_type_register_collection ("GPtrArray", &ptrarray_vtable, 0);
|
|
|
|
static const DBusGTypeSpecializedCollectionVtable slist_vtable = {
|
|
{
|
|
slist_constructor,
|
|
slist_free,
|
|
slist_copy,
|
|
},
|
|
NULL,
|
|
slist_iterator,
|
|
slist_append,
|
|
slist_end_append,
|
|
};
|
|
|
|
dbus_g_type_register_collection ("GSList", &slist_vtable, 0);
|
|
|
|
static const DBusGTypeSpecializedMapVtable hashtable_vtable = {
|
|
{
|
|
hashtable_constructor,
|
|
hashtable_free,
|
|
hashtable_copy,
|
|
NULL,
|
|
NULL,
|
|
NULL
|
|
},
|
|
hashtable_iterator
|
|
};
|
|
|
|
dbus_g_type_register_map ("GHashTable", &hashtable_vtable, 0);
|
|
}
|
|
|
|
#ifdef DBUS_BUILD_TESTS
|
|
|
|
typedef struct
|
|
{
|
|
gboolean seen_foo;
|
|
gboolean seen_baz;
|
|
} TestSpecializedHashData;
|
|
|
|
static void
|
|
test_specialized_hash (const GValue *key, const GValue *val, gpointer user_data)
|
|
{
|
|
TestSpecializedHashData *data = user_data;
|
|
|
|
g_assert (G_VALUE_HOLDS_STRING (key));
|
|
g_assert (G_VALUE_HOLDS_STRING (val));
|
|
|
|
if (!strcmp (g_value_get_string (key), "foo"))
|
|
{
|
|
data->seen_foo = TRUE;
|
|
g_assert (!strcmp (g_value_get_string (val), "bar"));
|
|
}
|
|
else if (!strcmp (g_value_get_string (key), "baz"))
|
|
{
|
|
data->seen_baz = TRUE;
|
|
g_assert (!strcmp (g_value_get_string (val), "moo"));
|
|
}
|
|
else
|
|
{
|
|
g_assert_not_reached ();
|
|
}
|
|
}
|
|
|
|
gboolean
|
|
_dbus_gvalue_utils_test (const char *datadir)
|
|
{
|
|
GType type;
|
|
|
|
dbus_g_type_specialized_init ();
|
|
dbus_g_type_specialized_builtins_init ();
|
|
|
|
type = dbus_g_type_get_collection ("GArray", G_TYPE_UINT);
|
|
g_assert (dbus_g_type_is_collection (type));
|
|
g_assert (dbus_g_type_get_collection_specialization (type) == G_TYPE_UINT);
|
|
{
|
|
GArray *instance;
|
|
|
|
instance = dbus_g_type_specialized_construct (type);
|
|
|
|
g_assert (instance->len == 0);
|
|
|
|
g_array_free (instance, TRUE);
|
|
}
|
|
|
|
type = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING);
|
|
g_assert (dbus_g_type_is_map (type));
|
|
g_assert (dbus_g_type_get_map_key_specialization (type) == G_TYPE_STRING);
|
|
g_assert (dbus_g_type_get_map_value_specialization (type) == G_TYPE_STRING);
|
|
{
|
|
GHashTable *instance;
|
|
GValue val = { 0, };
|
|
TestSpecializedHashData hashdata;
|
|
|
|
instance = dbus_g_type_specialized_construct (type);
|
|
|
|
g_assert (g_hash_table_size (instance) == 0);
|
|
g_hash_table_insert (instance, g_strdup ("foo"), g_strdup ("bar"));
|
|
g_hash_table_insert (instance, g_strdup ("baz"), g_strdup ("moo"));
|
|
g_assert (g_hash_table_size (instance) == 2);
|
|
|
|
g_value_init (&val, type);
|
|
g_value_set_boxed_take_ownership (&val, instance);
|
|
hashdata.seen_foo = FALSE;
|
|
hashdata.seen_baz = FALSE;
|
|
dbus_g_type_map_value_iterate (&val,
|
|
test_specialized_hash,
|
|
&hashdata);
|
|
|
|
g_assert (hashdata.seen_foo);
|
|
g_assert (hashdata.seen_baz);
|
|
|
|
g_value_unset (&val);
|
|
}
|
|
|
|
type = dbus_g_type_get_collection ("GPtrArray", G_TYPE_STRING);
|
|
g_assert (dbus_g_type_is_collection (type));
|
|
g_assert (dbus_g_type_get_collection_specialization (type) == G_TYPE_STRING);
|
|
{
|
|
GPtrArray *instance;
|
|
DBusGTypeSpecializedAppendContext ctx;
|
|
GValue val = {0, };
|
|
GValue eltval = {0, };
|
|
|
|
instance = dbus_g_type_specialized_construct (type);
|
|
|
|
g_assert (instance->len == 0);
|
|
|
|
g_value_init (&val, type);
|
|
g_value_set_boxed_take_ownership (&val, instance);
|
|
|
|
dbus_g_type_specialized_collection_init_append (&val, &ctx);
|
|
|
|
g_value_init (&eltval, G_TYPE_STRING);
|
|
g_value_set_static_string (&eltval, "foo");
|
|
dbus_g_type_specialized_collection_append (&ctx, &eltval);
|
|
|
|
g_value_reset (&eltval);
|
|
g_value_set_static_string (&eltval, "bar");
|
|
dbus_g_type_specialized_collection_append (&ctx, &eltval);
|
|
|
|
g_value_reset (&eltval);
|
|
g_value_set_static_string (&eltval, "baz");
|
|
dbus_g_type_specialized_collection_append (&ctx, &eltval);
|
|
|
|
dbus_g_type_specialized_collection_end_append (&ctx);
|
|
|
|
g_assert (instance->len == 3);
|
|
|
|
g_assert (!strcmp ("foo", g_ptr_array_index (instance, 0)));
|
|
g_assert (!strcmp ("bar", g_ptr_array_index (instance, 1)));
|
|
g_assert (!strcmp ("baz", g_ptr_array_index (instance, 2)));
|
|
|
|
g_value_unset (&val);
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
#endif /* DBUS_BUILD_TESTS */
|