mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2025-12-22 07:50:09 +01:00
This patch is based on initial work from Paul Kuliniewicz <kuliniew@purdue.edu>. * glib/dbus-gvalue.c (dbus_gvalue_init): New function; move initialization of GValue from dbus type to here. (dbus_gvalue_genmarshal_name_from_type): New function; generates a string for the "glib-genmarshal" program from a DBus type. (dbus_gvalue_binding_type_from_type): New function; turns a DBus type into the C name for it we use in the glib bindings. (dbus_gvalue_ctype_from_type): New function; maps a DBus type into a glib C type (not GValue). (dbus_gvalue_demarshal): invoke dbus_gvalue_init. * glib/dbus-gutils.c (_dbus_gutils_wincaps_to_uscore): Moved here from dbus-gobject.c. * glib/dbus-gutils.h: Prototype it. * glib/dbus-gproxy.c: Include new dbus-gobject.h. (marshal_dbus_message_to_g_marshaller): Use new shared function dbus_glib_marshal_dbus_message_to_gvalue_array. * glib/dbus-gparser.c (parse_interface, parse_method): Handle c_name attribute. Will be changed once we have annotations. * glib/dbus-gobject.c: Change info_hash_mutex from GStaticMutex to GStaticRWLock. Callers updated. (wincaps_to_uscore): Move to dbus-gutils.c. Callers updated. (string_table_next): New function for iterating over zero-terminated string value array. (string_table_lookup): New function; retrieves specific entry in array. (get_method_data): New function; look up method data in object data chunk. (object_error_domain_prefix_from_object_info) (object_error_code_from_object_info): New functions, but not implemented yet. (method_interface_from_object_info): New function; retrieve interface name. (method_name_from_object_info): New function; retrieve method name. (method_arg_info_from_object_info): New function; retrieve argument data. (arg_iterate): New function; iterates over serialized argument data. (method_dir_signature_from_object_info): New function; returns a GString holding type signature for arguments for just one direction (input or output). (method_input_signature_from_object_info) (method_output_signature_from_object_info): New functions. (dbus_glib_marshal_dbus_message_to_gvalue_array): New shared function; converts dbus message arguments into a GValue array. Used for both signal handling and method invocation. (struct DBusGlibWriteIterfaceData): New utility structure. (write_interface): New function; generate introspection XML for an interface. (introspect_interfaces): New function; gathers all interface->methods, generates introspection XML for them. (handle_introspect): Invoke introspect_interfaces. (get_object_property): Be sure to zero-initalize stack-allocated GValue. (lookup_object_and_method): New function; examines an incoming message and attempts to match it up (via interface, method name, and argument signature) with a known object and method. (gerror_domaincode_to_dbus_error_name): New function; converts a GError domain and code into a DBus error name. Needs GError data added to object introspection to work well. (gerror_to_dbus_error_message): Creates a DBusMessage error return from GError. (invoke_object_method): New function to invoke an object method looked up via lookup_object_and_method. Parses the incoming message, turns it into a GValue array, then invokes the marshaller specified in the DBusGMethodInfo. Creates a new message with either return values or error message as appropriate. (gobject_message_function): Invoke lookup_object_and_method and invoke_object_method. * glib/dbus-glib-tool.c: Include dbus-binding-tool-glib.h. (enum DBusBindingOutputMode): New enum for binding output modes. (pretty_print): Print binding names. (dbus_binding_tool_error_quark): GError bits. (version): Fix typo. (main): Create GIOChannel for output. Parse new --mode argument, possible values are "pretty-print", "glib-server", "glib-client". Use mode to invoke appropriate function. * glib/dbus-gobject.h: Prototype dbus_glib_marshal_dbus_message_to_gvalue_array. * glib/dbus-glib-tool.h: New header, just includes GError bits for now. * glib/dbus-gidl.c (struct InterfaceInfo): Add bindings hashtable; maps binding style to name. (struct MethodInfo): Ditto. (get_hash_keys, get_hash_key): Utility function, returns keys for a GHashTable. (interface_info_new, method_info_new): Initialize bindings. (interface_info_unref, method_info_unref): Destroy bindings. (method_info_get_binding_names, method_info_get_binding_name) (interface_info_get_binding_names, interface_info_get_binding_name): Functions for retrieving binding names. (method_info_set_binding_name, interface_info_set_binding_name): Functions for setting binding names. * glib/dbus-binding-tool-glib.h: New file, has prototypes for glib binding generation. * glib/dbus-binding-tool-glib.c: New file, implements server-side and client-side glib glue generation. * glib/Makefile.am (dbus_binding_tool_SOURCES): Add dbus-binding-tool-glib.c, dbus-binding-tool-glib.h, dbus-glib-tool.h. * dbus/dbus-glib.h (struct DBusGMethodMarshaller): Remove in favor of using GClosureMarshal directly. (struct DBusGObjectInfo): Add n_infos member. * test/glib/test-service-glib.xml: New file; contains introspection data for MyTestObject used in test-service-glib.c. * test/glib/test-service-glib.c (enum MyObjectError): New GError enum. (my_object_do_nothing, my_object_increment, my_object_throw_error) (my_object_uppercase, my_object_many_args): New test methods. (main): Use dbus_g_object_class_install_info to include generated object info. * test/glib/Makefile.am: Generate server-side glue for test-service-glib.c, as well as client-side bindings. * test/glib/test-dbus-glib.c: Include test-service-glib-bindings.h. (main): Activate TestSuiteGLibService; test invoke a bunch of its methods using both the dbus_gproxy stuff directly as well as the generated bindings.
429 lines
13 KiB
C
429 lines
13 KiB
C
/* -*- mode: C; c-file-style: "gnu" -*- */
|
|
#include <dbus/dbus-glib.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include "test-service-glib-bindings.h"
|
|
|
|
static GMainLoop *loop = NULL;
|
|
static int n_times_foo_received = 0;
|
|
|
|
static gboolean
|
|
timed_exit (gpointer loop)
|
|
{
|
|
g_main_loop_quit (loop);
|
|
return TRUE;
|
|
}
|
|
|
|
static void
|
|
foo_signal_handler (DBusGProxy *proxy,
|
|
double d,
|
|
void *user_data)
|
|
{
|
|
n_times_foo_received += 1;
|
|
|
|
g_main_loop_quit (loop);
|
|
}
|
|
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
DBusGConnection *connection;
|
|
GError *error;
|
|
DBusGProxy *driver;
|
|
DBusGProxy *proxy;
|
|
DBusGPendingCall *call;
|
|
char **name_list;
|
|
int name_list_len;
|
|
int i;
|
|
guint32 result;
|
|
const char *v_STRING;
|
|
char *v_STRING_2;
|
|
guint32 v_UINT32;
|
|
guint32 v_UINT32_2;
|
|
double v_DOUBLE;
|
|
double v_DOUBLE_2;
|
|
|
|
g_type_init ();
|
|
|
|
loop = g_main_loop_new (NULL, FALSE);
|
|
|
|
error = NULL;
|
|
connection = dbus_g_bus_get (DBUS_BUS_SESSION,
|
|
&error);
|
|
if (connection == NULL)
|
|
{
|
|
g_printerr ("Failed to open connection to bus: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
|
|
/* should always get the same one */
|
|
g_assert (connection == dbus_g_bus_get (DBUS_BUS_SESSION, NULL));
|
|
g_assert (connection == dbus_g_bus_get (DBUS_BUS_SESSION, NULL));
|
|
g_assert (connection == dbus_g_bus_get (DBUS_BUS_SESSION, NULL));
|
|
|
|
/* Create a proxy object for the "bus driver" */
|
|
|
|
driver = dbus_g_proxy_new_for_name (connection,
|
|
DBUS_SERVICE_ORG_FREEDESKTOP_DBUS,
|
|
DBUS_PATH_ORG_FREEDESKTOP_DBUS,
|
|
DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS);
|
|
|
|
/* Call ListNames method */
|
|
|
|
call = dbus_g_proxy_begin_call (driver, "ListNames", DBUS_TYPE_INVALID);
|
|
|
|
error = NULL;
|
|
if (!dbus_g_proxy_end_call (driver, call, &error,
|
|
DBUS_TYPE_ARRAY, DBUS_TYPE_STRING,
|
|
&name_list, &name_list_len,
|
|
DBUS_TYPE_INVALID))
|
|
{
|
|
g_printerr ("Failed to complete ListNames call: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
|
|
g_print ("Names on the message bus:\n");
|
|
i = 0;
|
|
while (i < name_list_len)
|
|
{
|
|
g_assert (name_list[i] != NULL);
|
|
g_print (" %s\n", name_list[i]);
|
|
++i;
|
|
}
|
|
g_assert (name_list[i] == NULL);
|
|
|
|
g_strfreev (name_list);
|
|
|
|
/* Test handling of unknown method */
|
|
v_STRING = "blah blah blah blah blah";
|
|
v_UINT32 = 10;
|
|
call = dbus_g_proxy_begin_call (driver, "ThisMethodDoesNotExist",
|
|
DBUS_TYPE_STRING,
|
|
&v_STRING,
|
|
DBUS_TYPE_INT32,
|
|
&v_UINT32,
|
|
DBUS_TYPE_INVALID);
|
|
|
|
error = NULL;
|
|
if (dbus_g_proxy_end_call (driver, call, &error,
|
|
DBUS_TYPE_INVALID))
|
|
{
|
|
g_printerr ("Calling nonexistent method succeeded!\n");
|
|
exit (1);
|
|
}
|
|
|
|
g_print ("Got EXPECTED error from calling unknown method: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
|
|
/* Activate a service */
|
|
v_STRING = "org.freedesktop.DBus.TestSuiteEchoService";
|
|
v_UINT32 = 0;
|
|
call = dbus_g_proxy_begin_call (driver, "StartServiceByName",
|
|
DBUS_TYPE_STRING,
|
|
&v_STRING,
|
|
DBUS_TYPE_UINT32,
|
|
&v_UINT32,
|
|
DBUS_TYPE_INVALID);
|
|
|
|
error = NULL;
|
|
if (!dbus_g_proxy_end_call (driver, call, &error,
|
|
DBUS_TYPE_UINT32, &result,
|
|
DBUS_TYPE_INVALID))
|
|
{
|
|
g_printerr ("Failed to complete Activate call: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
|
|
g_print ("Starting echo service result = 0x%x\n", result);
|
|
|
|
/* Activate a service again */
|
|
v_STRING = "org.freedesktop.DBus.TestSuiteEchoService";
|
|
v_UINT32 = 0;
|
|
call = dbus_g_proxy_begin_call (driver, "StartServiceByName",
|
|
DBUS_TYPE_STRING,
|
|
&v_STRING,
|
|
DBUS_TYPE_UINT32,
|
|
&v_UINT32,
|
|
DBUS_TYPE_INVALID);
|
|
|
|
error = NULL;
|
|
if (!dbus_g_proxy_end_call (driver, call, &error,
|
|
DBUS_TYPE_UINT32, &result,
|
|
DBUS_TYPE_INVALID))
|
|
{
|
|
g_printerr ("Failed to complete Activate call: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
|
|
g_print ("Duplicate start of echo service = 0x%x\n", result);
|
|
|
|
/* Talk to the new service */
|
|
|
|
proxy = dbus_g_proxy_new_for_name_owner (connection,
|
|
"org.freedesktop.DBus.TestSuiteEchoService",
|
|
"/org/freedesktop/TestSuite",
|
|
"org.freedesktop.TestSuite",
|
|
&error);
|
|
|
|
if (proxy == NULL)
|
|
{
|
|
g_printerr ("Failed to create proxy for name owner: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
|
|
v_STRING = "my string hello";
|
|
call = dbus_g_proxy_begin_call (proxy, "Echo",
|
|
DBUS_TYPE_STRING,
|
|
&v_STRING,
|
|
DBUS_TYPE_INVALID);
|
|
|
|
error = NULL;
|
|
if (!dbus_g_proxy_end_call (proxy, call, &error,
|
|
DBUS_TYPE_STRING, &v_STRING,
|
|
DBUS_TYPE_INVALID))
|
|
{
|
|
g_printerr ("Failed to complete Echo call: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
|
|
g_print ("String echoed = \"%s\"\n", v_STRING);
|
|
|
|
/* Test oneway call and signal handling */
|
|
|
|
dbus_g_proxy_add_signal (proxy, "Foo", DBUS_TYPE_DOUBLE_AS_STRING);
|
|
|
|
dbus_g_proxy_connect_signal (proxy, "Foo",
|
|
G_CALLBACK (foo_signal_handler),
|
|
NULL, NULL);
|
|
|
|
dbus_g_proxy_call_no_reply (proxy, "EmitFoo",
|
|
DBUS_TYPE_INVALID);
|
|
|
|
dbus_g_connection_flush (connection);
|
|
|
|
g_timeout_add (5000, timed_exit, loop);
|
|
|
|
g_main_loop_run (loop);
|
|
|
|
if (n_times_foo_received != 1)
|
|
{
|
|
g_printerr ("Foo signal received %d times, should have been 1\n",
|
|
n_times_foo_received);
|
|
exit (1);
|
|
}
|
|
|
|
/* Activate test servie */
|
|
g_print ("Activating TestSuiteGLibService\n");
|
|
v_STRING = "org.freedesktop.DBus.TestSuiteGLibService";
|
|
v_UINT32 = 0;
|
|
call = dbus_g_proxy_begin_call (driver, "StartServiceByName",
|
|
DBUS_TYPE_STRING,
|
|
&v_STRING,
|
|
DBUS_TYPE_UINT32,
|
|
&v_UINT32,
|
|
DBUS_TYPE_INVALID);
|
|
|
|
error = NULL;
|
|
if (!dbus_g_proxy_end_call (driver, call, &error,
|
|
DBUS_TYPE_UINT32, &result,
|
|
DBUS_TYPE_INVALID))
|
|
{
|
|
g_printerr ("Failed to complete Activate call: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
|
|
g_object_unref (G_OBJECT (proxy));
|
|
|
|
proxy = dbus_g_proxy_new_for_name_owner (connection,
|
|
"org.freedesktop.DBus.TestSuiteGLibService",
|
|
"/org/freedesktop/DBus/Tests/MyTestObject",
|
|
"org.freedesktop.DBus.Tests.MyObject",
|
|
&error);
|
|
|
|
if (proxy == NULL)
|
|
{
|
|
g_printerr ("Failed to create proxy for name owner: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
|
|
call = dbus_g_proxy_begin_call (proxy, "DoNothing",
|
|
DBUS_TYPE_INVALID);
|
|
error = NULL;
|
|
if (!dbus_g_proxy_end_call (proxy, call, &error, DBUS_TYPE_INVALID))
|
|
{
|
|
g_printerr ("Failed to complete DoNothing call: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
|
|
v_UINT32 = 42;
|
|
call = dbus_g_proxy_begin_call (proxy, "Increment",
|
|
DBUS_TYPE_UINT32, &v_UINT32,
|
|
DBUS_TYPE_INVALID);
|
|
error = NULL;
|
|
if (!dbus_g_proxy_end_call (proxy, call, &error,
|
|
DBUS_TYPE_UINT32, &v_UINT32_2,
|
|
DBUS_TYPE_INVALID))
|
|
{
|
|
g_printerr ("Failed to complete Increment call: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
|
|
if (v_UINT32_2 != v_UINT32 + 1)
|
|
{
|
|
g_printerr ("Increment call returned %d, should be 43\n", v_UINT32_2);
|
|
exit (1);
|
|
}
|
|
|
|
call = dbus_g_proxy_begin_call (proxy, "ThrowError", DBUS_TYPE_INVALID);
|
|
error = NULL;
|
|
if (dbus_g_proxy_end_call (proxy, call, &error, DBUS_TYPE_INVALID) != FALSE)
|
|
{
|
|
g_printerr ("ThrowError call unexpectedly succeeded!\n");
|
|
exit (1);
|
|
}
|
|
|
|
g_print ("ThrowError failed (as expected) returned error: %s\n", error->message);
|
|
g_error_free (error);
|
|
|
|
v_STRING = "foobar";
|
|
call = dbus_g_proxy_begin_call (proxy, "Uppercase",
|
|
DBUS_TYPE_STRING, &v_STRING,
|
|
DBUS_TYPE_INVALID);
|
|
error = NULL;
|
|
if (!dbus_g_proxy_end_call (proxy, call, &error,
|
|
DBUS_TYPE_STRING, &v_STRING_2,
|
|
DBUS_TYPE_INVALID))
|
|
{
|
|
g_printerr ("Failed to complete Uppercase call: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
if (strcmp ("FOOBAR", v_STRING_2) != 0)
|
|
{
|
|
g_printerr ("Uppercase call returned unexpected string %s\n", v_STRING_2);
|
|
exit (1);
|
|
}
|
|
|
|
v_STRING = "bazwhee";
|
|
v_UINT32 = 26;
|
|
v_DOUBLE = G_PI;
|
|
call = dbus_g_proxy_begin_call (proxy, "ManyArgs",
|
|
DBUS_TYPE_UINT32, &v_UINT32,
|
|
DBUS_TYPE_STRING, &v_STRING,
|
|
DBUS_TYPE_DOUBLE, &v_DOUBLE,
|
|
DBUS_TYPE_INVALID);
|
|
error = NULL;
|
|
if (!dbus_g_proxy_end_call (proxy, call, &error,
|
|
DBUS_TYPE_DOUBLE, &v_DOUBLE_2,
|
|
DBUS_TYPE_STRING, &v_STRING_2,
|
|
DBUS_TYPE_INVALID))
|
|
{
|
|
g_printerr ("Failed to complete ManyArgs call: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
if (v_DOUBLE_2 < 55 || v_DOUBLE_2 > 56)
|
|
{
|
|
g_printerr ("ManyArgs call returned unexpected double value %f\n", v_DOUBLE_2);
|
|
exit (1);
|
|
}
|
|
if (strcmp ("BAZWHEE", v_STRING_2) != 0)
|
|
{
|
|
g_printerr ("ManyArgs call returned unexpected string %s\n", v_STRING_2);
|
|
exit (1);
|
|
}
|
|
|
|
if (!org_freedesktop_DBus_Tests_MyObject_do_nothing (proxy, &error))
|
|
{
|
|
g_printerr ("Failed to complete (wrapped) DoNothing call: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
|
|
if (!org_freedesktop_DBus_Tests_MyObject_increment (proxy, 42, &v_UINT32_2, &error))
|
|
{
|
|
g_printerr ("Failed to complete (wrapped) Increment call: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
|
|
if (v_UINT32_2 != 43)
|
|
{
|
|
g_printerr ("(wrapped) increment call returned %d, should be 43\n", v_UINT32_2);
|
|
exit (1);
|
|
}
|
|
|
|
if (org_freedesktop_DBus_Tests_MyObject_throw_error (proxy, &error) != FALSE)
|
|
{
|
|
g_printerr ("(wrapped) ThrowError call unexpectedly succeeded!\n");
|
|
exit (1);
|
|
}
|
|
|
|
g_print ("(wrapped) ThrowError failed (as expected) returned error: %s\n", error->message);
|
|
g_error_free (error);
|
|
|
|
if (!org_freedesktop_DBus_Tests_MyObject_uppercase (proxy, "foobar", &v_STRING_2, &error))
|
|
{
|
|
g_printerr ("Failed to complete (wrapped) Uppercase call: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
if (strcmp ("FOOBAR", v_STRING_2) != 0)
|
|
{
|
|
g_printerr ("(wrapped) Uppercase call returned unexpected string %s\n", v_STRING_2);
|
|
exit (1);
|
|
}
|
|
|
|
if (!org_freedesktop_DBus_Tests_MyObject_many_args (proxy, 26, "bazwhee", G_PI,
|
|
&v_DOUBLE_2, &v_STRING_2, &error))
|
|
{
|
|
g_printerr ("Failed to complete (wrapped) ManyArgs call: %s\n",
|
|
error->message);
|
|
g_error_free (error);
|
|
exit (1);
|
|
}
|
|
if (v_DOUBLE_2 < 55 || v_DOUBLE_2 > 56)
|
|
{
|
|
g_printerr ("(wrapped) ManyArgs call returned unexpected double value %f\n", v_DOUBLE_2);
|
|
exit (1);
|
|
}
|
|
if (strcmp ("BAZWHEE", v_STRING_2) != 0)
|
|
{
|
|
g_printerr ("(wrapped) ManyArgs call returned unexpected string %s\n", v_STRING_2);
|
|
exit (1);
|
|
}
|
|
|
|
g_object_unref (G_OBJECT (proxy));
|
|
g_object_unref (G_OBJECT (driver));
|
|
|
|
g_print ("Successfully completed %s\n", argv[0]);
|
|
|
|
return 0;
|
|
}
|