From d8e7405eb35974518b0b579e2e2789fd065cb477 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 8 Jul 2005 17:02:42 +0000 Subject: Make async bindings work again --- ChangeLog | 11 +++++++++++ dbus/dbus-glib.h | 9 ++++++--- glib/dbus-binding-tool-glib.c | 31 +++++++++++++------------------ test/glib/test-dbus-glib.c | 28 ++++++++++++++++++++++++++-- 4 files changed, 56 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e6a0466..9ad68040 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2005-07-08 Ross Burton + + * dbus/dbus-glib.h: + Add DBysGAsyncData for the async bindings. + + * glib/dbus-binding-tool-glib.c: + Re-enable the async bindings. + + * test/glib/test-dbus-glib.c: + Add a test for the generated async bindings. + 2005-07-08 Colin Walters * doc/TODO: Update GLib todo bits, also add a post-1.0 TODO for a diff --git a/dbus/dbus-glib.h b/dbus/dbus-glib.h index 4b3672c2..ad156b83 100644 --- a/dbus/dbus-glib.h +++ b/dbus/dbus-glib.h @@ -280,11 +280,14 @@ void dbus_g_method_return (DBusGMethodInvocation *con void dbus_g_method_return_error (DBusGMethodInvocation *context, GError *error); +/* Probably possible to replace this with a closure */ +typedef struct { + GCallback cb; + gpointer userdata; +} DBusGAsyncData; + #undef DBUS_INSIDE_DBUS_GLIB_H G_END_DECLS #endif /* DBUS_GLIB_H */ - - - diff --git a/glib/dbus-binding-tool-glib.c b/glib/dbus-binding-tool-glib.c index 18ce1fcf..e503f05c 100644 --- a/glib/dbus-binding-tool-glib.c +++ b/glib/dbus-binding-tool-glib.c @@ -98,8 +98,7 @@ dbus_g_type_get_c_name (GType gtype) if (dbus_g_type_is_map (gtype)) return "GHashTable"; - if (g_type_is_a (gtype, G_TYPE_STRING) - || g_type_is_a (gtype, DBUS_TYPE_G_OBJECT_PATH)) + if (g_type_is_a (gtype, G_TYPE_STRING)) return "char *"; /* This one is even more hacky...we get an extra * @@ -107,6 +106,8 @@ dbus_g_type_get_c_name (GType gtype) */ if (g_type_is_a (gtype, G_TYPE_STRV)) return "char *"; + if (g_type_is_a (gtype, DBUS_TYPE_G_OBJECT_PATH)) + return "char"; return g_type_name (gtype); } @@ -1171,7 +1172,7 @@ write_async_method_client (GIOChannel *channel, InterfaceInfo *interface, Method method_name = compute_client_method_name (iface_prefix, method); /* Write the typedef for the client callback */ - if (!write_printf_to_iochannel ("typedef void (*%s_reply) (", channel, error, method_name)) + if (!write_printf_to_iochannel ("typedef void (*%s_reply) (DBusGProxy *proxy, ", channel, error, method_name)) goto io_lose; { GSList *args; @@ -1202,17 +1203,18 @@ write_async_method_client (GIOChannel *channel, InterfaceInfo *interface, Method /* Write the callback when the call returns */ WRITE_OR_LOSE ("static void\n"); - if (!write_printf_to_iochannel ("%s_async_callback (DBusGPendingCall *pending, DBusGAsyncData *data)\n", channel, error, method_name)) + if (!write_printf_to_iochannel ("%s_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)\n", channel, error, method_name)) goto io_lose; WRITE_OR_LOSE ("{\n"); - WRITE_OR_LOSE (" GError *error = NULL;\n"); + WRITE_OR_LOSE (" DBusGAsyncData *data = user_data;\n GError *error = NULL;\n"); if (!write_formal_declarations_for_direction (interface, method, channel, ARG_OUT, error)) goto io_lose; - WRITE_OR_LOSE (" dbus_g_proxy_end_call (data->proxy, pending, &error, "); + /* TODO: handle return boolean of end_call */ + WRITE_OR_LOSE (" dbus_g_proxy_end_call (proxy, call, &error, "); if (!write_typed_args_for_direction (interface, method, channel, ARG_OUT, error)) goto io_lose; WRITE_OR_LOSE("G_TYPE_INVALID);\n"); - if (!write_printf_to_iochannel (" (*(%s_reply)data->cb) (", channel, error, method_name)) + if (!write_printf_to_iochannel (" (*(%s_reply)data->cb) (proxy, ", channel, error, method_name)) goto io_lose; if (!write_untyped_out_args (interface, method, channel, error)) goto io_lose; @@ -1221,7 +1223,7 @@ write_async_method_client (GIOChannel *channel, InterfaceInfo *interface, Method /* Write the main wrapper function */ - WRITE_OR_LOSE ("static\n#ifdef G_HAVE_INLINE\ninline\n#endif\ngboolean\n"); + WRITE_OR_LOSE ("static\n#ifdef G_HAVE_INLINE\ninline\n#endif\nDBusGProxyCall*\n"); if (!write_printf_to_iochannel ("%s_async (DBusGProxy *proxy", channel, error, method_name)) goto io_lose; @@ -1232,17 +1234,12 @@ write_async_method_client (GIOChannel *channel, InterfaceInfo *interface, Method goto io_lose; WRITE_OR_LOSE ("{\n"); - WRITE_OR_LOSE (" DBusGPendingCall *pending;\n DBusGAsyncData *stuff;\n stuff = g_new (DBusGAsyncData, 1);\n stuff->proxy = proxy;\n stuff->cb = callback;\n stuff->userdata = userdata;\n"); - if (!write_printf_to_iochannel (" pending = dbus_g_proxy_begin_call (proxy, \"%s\", ", channel, error, method_info_get_name (method))) + WRITE_OR_LOSE (" DBusGAsyncData *stuff;\n stuff = g_new (DBusGAsyncData, 1);\n stuff->cb = G_CALLBACK (callback);\n stuff->userdata = userdata;\n"); + if (!write_printf_to_iochannel (" return dbus_g_proxy_begin_call (proxy, \"%s\", %s_async_callback, stuff, g_free, ", channel, error, method_info_get_name (method), method_name)) goto io_lose; if (!write_args_for_direction (interface, method, channel, ARG_IN, error)) goto io_lose; - WRITE_OR_LOSE ("G_TYPE_INVALID);\n"); - - if (!write_printf_to_iochannel (" dbus_g_pending_call_set_notify(pending, (DBusGPendingCallNotify)%s_async_callback, stuff, g_free);\n", channel, error, method_name)) - goto io_lose; - - WRITE_OR_LOSE (" return TRUE;\n}\n\n"); + WRITE_OR_LOSE ("G_TYPE_INVALID);\n}\n"); g_free (method_name); return TRUE; @@ -1350,9 +1347,7 @@ generate_client_glue (BaseInfo *base, DBusBindingToolCData *data, GError **error WRITE_OR_LOSE ("G_TYPE_INVALID);\n}\n\n"); -#if 0 write_async_method_client (channel, interface, method, error); -#endif } if (!write_printf_to_iochannel ("#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_%s */\n\n", channel, error, iface_prefix)) diff --git a/test/glib/test-dbus-glib.c b/test/glib/test-dbus-glib.c index 69875703..15cd769a 100644 --- a/test/glib/test-dbus-glib.c +++ b/test/glib/test-dbus-glib.c @@ -194,7 +194,7 @@ echo_received_cb (DBusGProxy *proxy, G_TYPE_INVALID)) lose_gerror ("Failed to complete async Echo", error); g_assert (echo_data != NULL); - g_print ("Async echo gave \"%s\"", echo_data); + g_print ("Async echo gave \"%s\"\n", echo_data); g_free (echo_data); g_main_loop_quit (loop); g_source_remove (exit_timeout); @@ -221,11 +221,28 @@ increment_received_cb (DBusGProxy *proxy, if (val != 43) lose ("Increment call returned %d, should be 43", val); - g_print ("Async increment gave \"%d\"", val); + g_print ("Async increment gave \"%d\"\n", val); g_main_loop_quit (loop); g_source_remove (exit_timeout); } +static void +increment_async_cb (DBusGProxy *proxy, guint val, GError *error, gpointer data) +{ + if (error) + lose_gerror ("Failed to complete (wrapped async) Increment call", error); + + if (data != NULL) + lose ("(wrapped async) Increment call gave unexpected data"); + if (val != 43) + lose ("(wrapped async) Increment call returned %d, should be 43", val); + + g_print ("(wrapped async) increment gave \"%d\"\n", val); + g_main_loop_quit (loop); + g_source_remove (exit_timeout); +} + + static void lose (const char *str, ...) { @@ -543,6 +560,13 @@ main (int argc, char **argv) if (v_UINT32_2 != 43) lose ("(wrapped) increment call returned %d, should be 43", v_UINT32_2); + g_print ("Calling (wrapped async) increment\n"); + if (!org_freedesktop_DBus_Tests_MyObject_increment_async (proxy, 42, increment_async_cb, NULL)) + lose_gerror ("Failed to complete (wrapped) Increment call", error); + dbus_g_connection_flush (connection); + exit_timeout = g_timeout_add (5000, timed_exit, loop); + g_main_loop_run (loop); + v_UINT32_2 = 0; if (!org_freedesktop_DBus_Tests_MyObject_async_increment (proxy, 42, &v_UINT32_2, &error)) lose_gerror ("Failed to complete (wrapped) AsyncIncrement call", error); -- cgit