Attachment 58075 Details for Bug 46835 – [next 03/10] If generating split re-entrant functions, duplicate the collect callback

[patch] [next 03/10] If generating split re-entrant functions, duplicate the collect callback

0003-If-generating-split-re-entrant-functions-duplicate-t.patch (text/plain), 9.57 KB, created by Simon McVittie on 2012-03-06 11:27:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-03-06 11:27:20 UTC

Size: 9.57 KB

patch

obsolete

>From d6b1f56a93b4b67755e198e76870e89cae026af1 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 6 Mar 2012 18:15:16 +0000
>Subject: [PATCH 03/10] If generating split re-entrant functions, duplicate
> the collect callback
>
>This means we don't have to duplicate the entire -body.h in reentrants.c.
>---
> telepathy-glib/reentrants.c |   13 -----
> tools/glib-client-gen.py    |  117 +++++++++++++++++++++++--------------------
> 2 files changed, 62 insertions(+), 68 deletions(-)
>
>diff --git a/telepathy-glib/reentrants.c b/telepathy-glib/reentrants.c
>index 95267f7..7667e28 100644
>--- a/telepathy-glib/reentrants.c
>+++ b/telepathy-glib/reentrants.c
>@@ -1,18 +1,5 @@
> #include "reentrants.h"
> 
>-#include <telepathy-glib/_gen/tp-cli-account-body.h>
>-#include <telepathy-glib/_gen/tp-cli-account-manager-body.h>
>-#include <telepathy-glib/_gen/tp-cli-channel-body.h>
>-#include <telepathy-glib/_gen/tp-cli-channel-dispatcher-body.h>
>-#include <telepathy-glib/_gen/tp-cli-channel-dispatch-operation-body.h>
>-#include <telepathy-glib/_gen/tp-cli-channel-request-body.h>
>-#include <telepathy-glib/_gen/tp-cli-client-body.h>
>-#include <telepathy-glib/_gen/tp-cli-connection-body.h>
>-#include <telepathy-glib/_gen/tp-cli-connection-manager-body.h>
>-#include <telepathy-glib/_gen/tp-cli-dbus-daemon-body.h>
>-#include <telepathy-glib/_gen/tp-cli-generic-body.h>
>-#include <telepathy-glib/_gen/tp-cli-protocol-body.h>
>-
> #include <telepathy-glib/_gen/tp-cli-account-reentrant-body.h>
> #include <telepathy-glib/_gen/tp-cli-account-manager-reentrant-body.h>
> #include <telepathy-glib/_gen/tp-cli-channel-reentrant-body.h>
>diff --git a/tools/glib-client-gen.py b/tools/glib-client-gen.py
>index 6919b6b..cf4f97c 100644
>--- a/tools/glib-client-gen.py
>+++ b/tools/glib-client-gen.py
>@@ -511,19 +511,25 @@ class Generator(object):
>                                                            iface_lc,
>                                                            member_lc)
> 
>+        # This is needed by both reentrant and non-reentrant calls
>+        if self.split_reentrants:
>+            collector = lambda x: (self.b(x), self.rb(x))
>+        else:
>+            collector = self.b
>+
>         # The callback called by dbus-glib; this ends the call and collects
>         # the results into a GValueArray.
>-        self.b('static void')
>-        self.b('%s (DBusGProxy *proxy,' % collect_callback)
>-        self.b('    DBusGProxyCall *call,')
>-        self.b('    gpointer user_data)')
>-        self.b('{')
>-        self.b('  GError *error = NULL;')
>+        collector('static void')
>+        collector('%s (DBusGProxy *proxy,' % collect_callback)
>+        collector('    DBusGProxyCall *call,')
>+        collector('    gpointer user_data)')
>+        collector('{')
>+        collector('  GError *error = NULL;')
> 
>         if len(out_args) > 0:
>-            self.b('  GValueArray *args;')
>-            self.b('  GValue blank = { 0 };')
>-            self.b('  guint i;')
>+            collector('  GValueArray *args;')
>+            collector('  GValue blank = { 0 };')
>+            collector('  guint i;')
> 
>             for arg in out_args:
>                 name, info, tp_type, elt = arg
>@@ -533,92 +539,93 @@ class Generator(object):
>                 # have already allocated storage for them". Thanks,
>                 # dbus-glib...
>                 if gtype == 'G_TYPE_VALUE':
>-                    self.b('  GValue *%s = g_new0 (GValue, 1);' % name)
>+                    collector('  GValue *%s = g_new0 (GValue, 1);' % name)
>                 else:
>-                    self.b('  %s%s;' % (ctype, name))
>+                    collector('  %s%s;' % (ctype, name))
> 
>-        self.b('')
>-        self.b('  dbus_g_proxy_end_call (proxy, call, &error,')
>+        collector('')
>+        collector('  dbus_g_proxy_end_call (proxy, call, &error,')
> 
>         for arg in out_args:
>             name, info, tp_type, elt = arg
>             ctype, gtype, marshaller, pointer = info
> 
>             if gtype == 'G_TYPE_VALUE':
>-                self.b('      %s, %s,' % (gtype, name))
>+                collector('      %s, %s,' % (gtype, name))
>             else:
>-                self.b('      %s, &%s,' % (gtype, name))
>+                collector('      %s, &%s,' % (gtype, name))
> 
>-        self.b('      G_TYPE_INVALID);')
>+        collector('      G_TYPE_INVALID);')
> 
>         if len(out_args) == 0:
>-            self.b('  tp_proxy_pending_call_v0_take_results (user_data, error,'
>+            collector('  tp_proxy_pending_call_v0_take_results (user_data, error,'
>                    'NULL);')
>         else:
>-            self.b('')
>-            self.b('  if (error != NULL)')
>-            self.b('    {')
>-            self.b('      tp_proxy_pending_call_v0_take_results (user_data, error,')
>-            self.b('          NULL);')
>+            collector('')
>+            collector('  if (error != NULL)')
>+            collector('    {')
>+            collector('      tp_proxy_pending_call_v0_take_results (user_data, error,')
>+            collector('          NULL);')
> 
>             for arg in out_args:
>                 name, info, tp_type, elt = arg
>                 ctype, gtype, marshaller, pointer = info
>                 if gtype == 'G_TYPE_VALUE':
>-                    self.b('      g_free (%s);' % name)
>+                    collector('      g_free (%s);' % name)
> 
>-            self.b('      return;')
>-            self.b('    }')
>-            self.b('')
>-            self.b('  args = g_value_array_new (%d);' % len(out_args))
>-            self.b('  g_value_init (&blank, G_TYPE_INT);')
>-            self.b('')
>-            self.b('  for (i = 0; i < %d; i++)' % len(out_args))
>-            self.b('    g_value_array_append (args, &blank);')
>+            collector('      return;')
>+            collector('    }')
>+            collector('')
>+            collector('  args = g_value_array_new (%d);' % len(out_args))
>+            collector('  g_value_init (&blank, G_TYPE_INT);')
>+            collector('')
>+            collector('  for (i = 0; i < %d; i++)' % len(out_args))
>+            collector('    g_value_array_append (args, &blank);')
> 
>             for i, arg in enumerate(out_args):
>                 name, info, tp_type, elt = arg
>                 ctype, gtype, marshaller, pointer = info
> 
>-                self.b('')
>-                self.b('  g_value_unset (args->values + %d);' % i)
>-                self.b('  g_value_init (args->values + %d, %s);' % (i, gtype))
>+                collector('')
>+                collector('  g_value_unset (args->values + %d);' % i)
>+                collector('  g_value_init (args->values + %d, %s);'
>+                          % (i, gtype))
> 
>                 if gtype == 'G_TYPE_STRING':
>-                    self.b('  g_value_take_string (args->values + %d, %s);'
>-                           % (i, name))
>+                    collector('  g_value_take_string (args->values + %d, %s);'
>+                              % (i, name))
>                 elif marshaller == 'BOXED':
>-                    self.b('  g_value_take_boxed (args->values + %d, %s);'
>-                            % (i, name))
>+                    collector('  g_value_take_boxed (args->values + %d, %s);'
>+                              % (i, name))
>                 elif gtype == 'G_TYPE_UCHAR':
>-                    self.b('  g_value_set_uchar (args->values + %d, %s);'
>-                            % (i, name))
>+                    collector('  g_value_set_uchar (args->values + %d, %s);'
>+                              % (i, name))
>                 elif gtype == 'G_TYPE_BOOLEAN':
>-                    self.b('  g_value_set_boolean (args->values + %d, %s);'
>-                            % (i, name))
>+                    collector('  g_value_set_boolean (args->values + %d, %s);'
>+                              % (i, name))
>                 elif gtype == 'G_TYPE_INT':
>-                    self.b('  g_value_set_int (args->values + %d, %s);'
>-                            % (i, name))
>+                    collector('  g_value_set_int (args->values + %d, %s);'
>+                              % (i, name))
>                 elif gtype == 'G_TYPE_UINT':
>-                    self.b('  g_value_set_uint (args->values + %d, %s);'
>-                            % (i, name))
>+                    collector('  g_value_set_uint (args->values + %d, %s);'
>+                              % (i, name))
>                 elif gtype == 'G_TYPE_INT64':
>-                    self.b('  g_value_set_int (args->values + %d, %s);'
>-                            % (i, name))
>+                    collector('  g_value_set_int (args->values + %d, %s);'
>+                              % (i, name))
>                 elif gtype == 'G_TYPE_UINT64':
>-                    self.b('  g_value_set_uint (args->values + %d, %s);'
>-                            % (i, name))
>+                    collector('  g_value_set_uint (args->values + %d, %s);'
>+                              % (i, name))
>                 elif gtype == 'G_TYPE_DOUBLE':
>-                    self.b('  g_value_set_double (args->values + %d, %s);'
>-                            % (i, name))
>+                    collector('  g_value_set_double (args->values + %d, %s);'
>+                              % (i, name))
>                 else:
>                     assert False, ("Don't know how to put %s in a GValue"
>                                    % gtype)
> 
>-            self.b('  tp_proxy_pending_call_v0_take_results (user_data, '
>-                   'NULL, args);')
>+            collector('  tp_proxy_pending_call_v0_take_results (user_data, '
>+                      'NULL, args);')
> 
>-        self.b('}')
>+        collector('}')
> 
>         self.b('static void')
>         self.b('%s (TpProxy *self,' % invoke_callback)
>-- 
>1.7.9.1
>

Actions: View | Splinter Review

Attachments on bug 46835: 57868 | 58069 | 58070 | 58071 | 58072 | 58073 | 58074 | 58075 | 58076 | 58077 | 58078 | 58079 | 58080 | 58081 | 58082 | 60692 | 60693 | 60694 | 60695 | 60696 | 60697 | 60801

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.