luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

GDBusConnection: copy object and subtree virtual tables

Browse Source 
Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
David Zeuthen 2010-07-14 14:46:12 -04:00
parent 914b046226
commit baf383d1b1
2 changed files with 58 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
gio/gdbusconnection.c
View File

@ -3391,6 +3391,40 @@ purge_all_signal_subscriptions (GDBusConnection *connection)
/* ---------------------------------------------------------------------------------------------------- */
static GDBusInterfaceVTable *
_g_dbus_interface_vtable_copy (const GDBusInterfaceVTable *vtable)
{
/* Don't waste memory by copying padding - remember to update this
* when changing struct _GDBusInterfaceVTable in gdbusconnection.h
*/
return g_memdup ((gconstpointer) vtable, 3 * sizeof (gpointer));
}
static void
_g_dbus_interface_vtable_free (GDBusInterfaceVTable *vtable)
{
g_free (vtable);
}
/* ---------------------------------------------------------------------------------------------------- */
static GDBusSubtreeVTable *
_g_dbus_subtree_vtable_copy (const GDBusSubtreeVTable *vtable)
{
/* Don't waste memory by copying padding - remember to update this
* when changing struct _GDBusSubtreeVTable in gdbusconnection.h
*/
return g_memdup ((gconstpointer) vtable, 3 * sizeof (gpointer));
}
static void
_g_dbus_subtree_vtable_free (GDBusSubtreeVTable *vtable)
{
g_free (vtable);
}
/* ---------------------------------------------------------------------------------------------------- */
struct ExportedObject
{
gchar *object_path;
@ -3415,8 +3449,8 @@ typedef struct
guint id;
gchar *interface_name;
const GDBusInterfaceVTable *vtable;
const GDBusInterfaceInfo *interface_info;
GDBusInterfaceVTable *vtable;
GDBusInterfaceInfo *interface_info;
GMainContext *context;
gpointer user_data;
@ -3437,6 +3471,7 @@ exported_interface_free (ExportedInterface *ei)
g_main_context_unref (ei->context);
g_free (ei->interface_name);
_g_dbus_interface_vtable_free (ei->vtable);
g_free (ei);
}
@ -4413,10 +4448,6 @@ obj_message_func (GDBusConnection *connection,
* If an existing callback is already registered at @object_path and
* @interface_name, then @error is set to #G_IO_ERROR_EXISTS.
*
* Note that @vtable is not copied, so the struct you pass must exist until
* the path is unregistered. One possibility is to free @vtable at the
* same time as @user_data when @user_data_free_func is called.
*
* GDBus automatically implements the standard D-Bus interfaces
* org.freedesktop.DBus.Properties, org.freedesktop.DBus.Introspectable
* and org.freedesktop.Peer, so you don't have to implement those for
@ -4424,6 +4455,11 @@ obj_message_func (GDBusConnection *connection,
* org.freedesktop.DBus.Properties yourself, e.g. to handle getting
* and setting of properties asynchronously.
*
* Note that the reference count on @interface_info will be
* incremented by 1 (unless allocated statically, e.g. if the
* reference count is -1, see g_dbus_interface_info_ref()) for as long
* as the object is exported. Also note that @vtable will be copied.
*
* See <xref linkend="gdbus-server"/> for an example of how to use this method.
*
* Returns: 0 if @error is set, otherwise a registration id (never 0)
@ -4484,7 +4520,7 @@ g_dbus_connection_register_object (GDBusConnection *connection,
ei->eo = eo;
ei->user_data = user_data;
ei->user_data_free_func = user_data_free_func;
ei->vtable = vtable;
ei->vtable = _g_dbus_interface_vtable_copy (vtable);
ei->interface_info = g_dbus_interface_info_ref ((GDBusInterfaceInfo *) interface_info);
ei->interface_name = g_strdup (interface_info->name);
ei->context = g_main_context_get_thread_default ();
@ -5094,7 +5130,7 @@ struct ExportedSubtree
guint id;
gchar *object_path;
GDBusConnection *connection;
const GDBusSubtreeVTable *vtable;
GDBusSubtreeVTable *vtable;
GDBusSubtreeFlags flags;
GMainContext *context;
@ -5112,6 +5148,7 @@ exported_subtree_free (ExportedSubtree *es)
if (es->context != NULL)
g_main_context_unref (es->context);
_g_dbus_subtree_vtable_free (es->vtable);
g_free (es->object_path);
g_free (es);
}
@ -5532,6 +5569,9 @@ subtree_message_func (GDBusConnection *connection,
* for object paths not registered via g_dbus_connection_register_object()
* or other bindings.
*
* Note that @vtable will be copied so you cannot change it after
* registration.
*
* See <xref linkend="gdbus-subtree-server"/> for an example of how to use this method.
*
* Returns: 0 if @error is set, otherwise a subtree registration id (never 0)
@ -5575,7 +5615,7 @@ g_dbus_connection_register_subtree (GDBusConnection *connection,
es->object_path = g_strdup (object_path);
es->connection = connection;
es->vtable = vtable;
es->vtable = _g_dbus_subtree_vtable_copy (vtable);
es->flags = flags;
es->id = _global_subtree_registration_id++; /* TODO: overflow etc. */
es->user_data = user_data;

19
gio/gdbusconnection.h
View File

@ -278,7 +278,10 @@ struct _GDBusInterfaceVTable
GDBusInterfaceSetPropertyFunc set_property;
/*< private >*/
/* Padding for future expansion */
/* Padding for future expansion - also remember to update
* gdbusconnection.c:_g_dbus_interface_vtable_copy() when
* changing this.
*/
gpointer padding[8];
};
@ -374,15 +377,11 @@ struct _GDBusSubtreeVTable
GDBusSubtreeDispatchFunc dispatch;
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
void (*_g_reserved2) (void);
void (*_g_reserved3) (void);
void (*_g_reserved4) (void);
void (*_g_reserved5) (void);
void (*_g_reserved6) (void);
void (*_g_reserved7) (void);
void (*_g_reserved8) (void);
/* Padding for future expansion - also remember to update
* gdbusconnection.c:_g_dbus_subtree_vtable_copy() when
* changing this.
*/
gpointer padding[8];
};
guint g_dbus_connection_register_subtree (GDBusConnection *connection,