Attachment 106368 Details for Bug 64214 – Use g_cclosure_marshal_generic for all marshalling

[patch] Use g_cclosure_marshal_generic for all marshalling

0002-Use-g_cclosure_marshal_generic-for-all-marshalling.patch (text/plain), 6.70 KB, created by Simon McVittie on 2014-09-16 12:38:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-09-16 12:38:12 UTC

Size: 6.70 KB

patch

obsolete

>From b5d394e8de7a5bd8abfcc323d02618629de04fb3 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 16 Sep 2014 13:36:28 +0100
>Subject: [PATCH 2/2] Use g_cclosure_marshal_generic for all marshalling
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=64214
>---
> dbus/dbus-gobject.c | 117 ++--------------------------------------------------
> dbus/dbus-gobject.h |   6 ---
> dbus/dbus-gproxy.c  |  18 ++------
> 3 files changed, 6 insertions(+), 135 deletions(-)
>
>diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
>index 496c606..8bce018 100644
>--- a/dbus/dbus-gobject.c
>+++ b/dbus/dbus-gobject.c
>@@ -103,7 +103,6 @@ typedef struct
> static GStaticRWLock globals_lock = G_STATIC_RW_LOCK_INIT;
> /* See comments in check_property_access */
> static gboolean disable_legacy_property_access = FALSE;
>-static GHashTable *marshal_table = NULL;
> static GData *error_metadata = NULL;
> 
> static char*
>@@ -2993,82 +2992,6 @@ funcsig_free (DBusGFuncSignature *sig)
>   g_free (sig);
> }
> 
>-GClosureMarshal
>-_dbus_gobject_lookup_marshaller (GType        rettype,
>-				 guint        n_params,
>-				 const GType *param_types)
>-{
>-  GClosureMarshal ret;
>-  DBusGFuncSignature sig;
>-  GType *params;
>-  guint i;
>-
>-  /* Convert to fundamental types */
>-  rettype = G_TYPE_FUNDAMENTAL (rettype);
>-  params = g_new (GType, n_params);
>-  for (i = 0; i < n_params; i++)
>-    params[i] = G_TYPE_FUNDAMENTAL (param_types[i]);
>-
>-  sig.rettype = rettype;
>-  sig.n_params = n_params;
>-  sig.params = params;
>-  
>-  g_static_rw_lock_reader_lock (&globals_lock);
>-
>-  if (marshal_table)
>-    ret = g_hash_table_lookup (marshal_table, &sig);
>-  else
>-    ret = NULL;
>-
>-  g_static_rw_lock_reader_unlock (&globals_lock);
>-
>-  if (ret == NULL)
>-    {
>-      if (rettype == G_TYPE_NONE)
>-	{
>-	  if (n_params == 0)
>-	    ret = g_cclosure_marshal_VOID__VOID;
>-	  else if (n_params == 1)
>-	    {
>-	      switch (params[0])
>-		{
>-		case G_TYPE_BOOLEAN:
>-		  ret = g_cclosure_marshal_VOID__BOOLEAN;
>-		  break;
>-		case G_TYPE_UCHAR:
>-		  ret = g_cclosure_marshal_VOID__UCHAR;
>-		  break;
>-		case G_TYPE_INT:
>-		  ret = g_cclosure_marshal_VOID__INT;
>-		  break;
>-		case G_TYPE_UINT:
>-		  ret = g_cclosure_marshal_VOID__UINT;
>-		  break;
>-		case G_TYPE_DOUBLE:
>-		  ret = g_cclosure_marshal_VOID__DOUBLE;
>-		  break;
>-		case G_TYPE_STRING:
>-		  ret = g_cclosure_marshal_VOID__STRING;
>-		  break;
>-		case G_TYPE_BOXED:
>-		  ret = g_cclosure_marshal_VOID__BOXED;
>-		  break;
>-		}
>-	    }
>-	  else if (n_params == 3
>-		   && params[0] == G_TYPE_STRING
>-		   && params[1] == G_TYPE_STRING
>-		   && params[2] == G_TYPE_STRING)
>-	    {
>-	      ret = _dbus_g_marshal_NONE__STRING_STRING_STRING;
>-	    }
>-	}
>-    }
>-
>-  g_free (params);
>-  return ret;
>-}
>-
> /**
>  * dbus_g_object_register_marshaller:
>  * @marshaller: a GClosureMarshal to be used for invocation
>@@ -3079,7 +3002,9 @@ _dbus_gobject_lookup_marshaller (GType        rettype,
>  * giving its return type and a list of parameter types,
>  * followed by %G_TYPE_INVALID.
>  *
>- * This function will not be needed once GLib includes libffi.
>+ * This function is no longer useful, and is only provided
>+ * for compatibility with older dbus-glib. The #GClosureMarshal
>+ * will not be called.
>  *
>  * Deprecated: New code should use GDBus instead.
>  */
>@@ -3088,22 +3013,6 @@ dbus_g_object_register_marshaller (GClosureMarshal  marshaller,
> 				   GType            rettype,
> 				   ...)
> {
>-  va_list args;
>-  GArray *types;
>-  GType gtype;
>-
>-  va_start (args, rettype);
>-
>-  types = g_array_new (TRUE, TRUE, sizeof (GType));
>-
>-  while ((gtype = va_arg (args, GType)) != G_TYPE_INVALID)
>-    g_array_append_val (types, gtype);
>-
>-  dbus_g_object_register_marshaller_array (marshaller, rettype,
>-					   types->len, (GType*) types->data);
>-
>-  g_array_free (types, TRUE);
>-  va_end (args);
> }
> 
> /**
>@@ -3124,26 +3033,6 @@ dbus_g_object_register_marshaller_array (GClosureMarshal  marshaller,
> 					 guint            n_types,
> 					 const GType*     types)
> {
>-  DBusGFuncSignature *sig;
>-  guint i;
>-
>-  g_static_rw_lock_writer_lock (&globals_lock);
>-
>-  if (marshal_table == NULL)
>-    marshal_table = g_hash_table_new_full (funcsig_hash,
>-					   funcsig_equal,
>-					   (GDestroyNotify) funcsig_free,
>-					   NULL);
>-  sig = g_new0 (DBusGFuncSignature, 1);
>-  sig->rettype = G_TYPE_FUNDAMENTAL (rettype);
>-  sig->n_params = n_types;
>-  sig->params = g_new (GType, n_types);
>-  for (i = 0; i < n_types; i++)
>-    sig->params[i] = G_TYPE_FUNDAMENTAL (types[i]);
>-
>-  g_hash_table_insert (marshal_table, sig, marshaller);
>-
>-  g_static_rw_lock_writer_unlock (&globals_lock);
> }
> 
> /**
>diff --git a/dbus/dbus-gobject.h b/dbus/dbus-gobject.h
>index fa1e005..cf97cd0 100644
>--- a/dbus/dbus-gobject.h
>+++ b/dbus/dbus-gobject.h
>@@ -32,12 +32,6 @@ G_BEGIN_DECLS
> 
> const char *       _dbus_gobject_get_path (GObject *obj);
> 
>-GClosureMarshal    _dbus_gobject_lookup_marshaller (GType        rettype,
>-						    guint        n_params,
>-						    const GType *param_types);
>-  
>-						    
>-
> G_END_DECLS
> 
> #endif
>diff --git a/dbus/dbus-gproxy.c b/dbus/dbus-gproxy.c
>index 7af9b44..2ced17b 100644
>--- a/dbus/dbus-gproxy.c
>+++ b/dbus/dbus-gproxy.c
>@@ -1703,7 +1703,6 @@ marshal_dbus_message_to_g_marshaller (GClosure     *closure,
>    */
> #define MAX_SIGNATURE_ARGS 20
>   GValueArray *value_array;
>-  GSignalCMarshaller c_marshaller;
>   DBusGProxy *proxy;
>   DBusMessage *message;
>   GArray *gsignature;
>@@ -1722,11 +1721,6 @@ marshal_dbus_message_to_g_marshaller (GClosure     *closure,
> 
>   priv = DBUS_G_PROXY_GET_PRIVATE(proxy);
> 
>-  c_marshaller = _dbus_gobject_lookup_marshaller (G_TYPE_NONE, gsignature->len,
>-						  (GType*) gsignature->data);
>-
>-  g_return_if_fail (c_marshaller != NULL);
>-  
>   {
>     DBusGValueMarshalCtx context;
>     context.recursion_depth = 0;
>@@ -1745,9 +1739,9 @@ marshal_dbus_message_to_g_marshaller (GClosure     *closure,
>   g_value_init (g_value_array_get_nth (value_array, 0), G_TYPE_FROM_INSTANCE (proxy));
>   g_value_set_instance (g_value_array_get_nth (value_array, 0), proxy);
> 
>-  (* c_marshaller) (closure, return_value, value_array->n_values,
>-		    value_array->values, invocation_hint, marshal_data);
>-  
>+  g_cclosure_marshal_generic (closure, return_value, value_array->n_values,
>+      value_array->values, invocation_hint, marshal_data);
>+
>   g_value_array_free (value_array);
> }
> 
>@@ -3120,12 +3114,6 @@ dbus_g_proxy_add_signal  (DBusGProxy        *proxy,
>     }
>   va_end (args);
> 
>-#ifndef G_DISABLE_CHECKS
>-  if (_dbus_gobject_lookup_marshaller (G_TYPE_NONE, gtypesig->len, (const GType*) gtypesig->data) == NULL)
>-    g_warning ("No marshaller for signature of signal '%s'", signal_name);
>-#endif
>-
>-  
>   g_datalist_id_set_data_full (&priv->signal_signatures,
>                                q, gtypesig,
>                                array_free_all);
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 64214: 78846 | 78847 | 106367 | 106368

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.