+2004-06-02 Kristian Høgsberg <krh@redhat.com>
+
+ * glib/dbus-gproxy.c, glib/dbus-gmain.c, dbus/dbus-string.c,
+ dbus/dbus-object-tree.c, dbus/dbus-message.c: add comments to
+ quiet doxygen.
+
+ * Doxyfile.in: remove deprecated options.
+
+ * dbus/dbus-message-handler.c, dbus/dbus-message-handler.h,
+ glib/test-thread.h, glib/test-thread-client.c,
+ glib/test-thread-server.c, glib/test-profile.c,
+ glib/test-dbus-glib.c: remove these unused files.
+
2004-06-01 Olivier Andrieu <oliv__a@users.sourceforge.net>
* dbus/dbus-object-tree.c
# Configuration::addtions related to the search engine
#---------------------------------------------------------------------------
SEARCHENGINE = NO
-CGI_NAME =
-CGI_URL =
-DOC_URL =
-DOC_ABSPATH =
-BIN_ABSPATH =
-EXT_DOC_PATHS =
+++ /dev/null
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-message-handler.c Sender/receiver of messages.
- *
- * Copyright (C) 2002, 2003 Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.0
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include "dbus-internals.h"
-#include "dbus-message-handler.h"
-#include "dbus-list.h"
-#include "dbus-threads.h"
-#include "dbus-test.h"
-#include "dbus-connection-internal.h"
-
-/**
- * @defgroup DBusMessageHandlerInternals DBusMessageHandler implementation details
- * @ingroup DBusInternals
- * @brief DBusMessageHandler private implementation details.
- *
- * The guts of DBusMessageHandler and its methods.
- *
- * @{
- */
-
-_DBUS_DEFINE_GLOBAL_LOCK (message_handler);
-
-/**
- * @brief Internals of DBusMessageHandler
- *
- * Object that can send and receive messages.
- */
-struct DBusMessageHandler
-{
- DBusAtomic refcount; /**< reference count */
-
- DBusHandleMessageFunction function; /**< handler function */
- void *user_data; /**< user data for function */
- DBusFreeFunction free_user_data; /**< free the user data */
-
- DBusList *connections; /**< connections we're registered with */
-};
-
-/**
- * Add this connection to the list used by this message handler.
- * When the message handler goes away, the connection
- * will be notified.
- *
- * @param handler the message handler
- * @param connection the connection
- * @returns #FALSE if not enough memory
- */
-dbus_bool_t
-_dbus_message_handler_add_connection (DBusMessageHandler *handler,
- DBusConnection *connection)
-{
- dbus_bool_t res;
-
- _DBUS_LOCK (message_handler);
- /* This is a bit wasteful - we just put the connection in the list
- * once per time it's added. :-/
- */
- if (!_dbus_list_prepend (&handler->connections, connection))
- res = FALSE;
- else
- res = TRUE;
-
- _DBUS_UNLOCK (message_handler);
-
- return res;
-}
-
-/**
- * Reverses the effect of _dbus_message_handler_add_connection().
- * @param handler the message handler
- * @param connection the connection
- */
-void
-_dbus_message_handler_remove_connection (DBusMessageHandler *handler,
- DBusConnection *connection)
-{
- _DBUS_LOCK (message_handler);
- if (!_dbus_list_remove (&handler->connections, connection))
- _dbus_warn ("Function _dbus_message_handler_remove_connection() called when the connection hadn't been added\n");
- _DBUS_UNLOCK (message_handler);
-}
-
-
-/**
- * Handles the given message, by dispatching the handler function
- * for this DBusMessageHandler, if any.
- *
- * @param handler the handler
- * @param connection the connection that received the message
- * @param message the message
- *
- * @returns what to do with the message
- */
-DBusHandlerResult
-_dbus_message_handler_handle_message (DBusMessageHandler *handler,
- DBusConnection *connection,
- DBusMessage *message)
-{
- DBusHandleMessageFunction function;
- void *user_data;
-
- _DBUS_LOCK (message_handler);
- function = handler->function;
- user_data = handler->user_data;
- _DBUS_UNLOCK (message_handler);
-
- /* This function doesn't ref handler/connection/message
- * since that's done in dbus_connection_dispatch().
- */
- if (function != NULL)
- return (* function) (handler, connection, message, user_data);
- else
- return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
-}
-
-/** @} */
-
-/**
- * @defgroup DBusMessageHandler DBusMessageHandler
- * @ingroup DBus
- * @brief Message processor
- *
- * A DBusMessageHandler is an object that can send and receive
- * messages. Typically the handler is registered with one or
- * more DBusConnection objects and processes some types of
- * messages received from the connection.
- *
- * @{
- */
-
-/**
- * @typedef DBusMessageHandler
- *
- * Opaque data type representing a message handler.
- */
-
-/**
- * Creates a new message handler. The handler function
- * may be #NULL for a no-op handler or a handler to
- * be assigned a function later.
- *
- * @param function function to call to handle a message
- * @param user_data data to pass to the function
- * @param free_user_data function to call to free the user data
- * @returns a new DBusMessageHandler or #NULL if no memory.
- */
-DBusMessageHandler*
-dbus_message_handler_new (DBusHandleMessageFunction function,
- void *user_data,
- DBusFreeFunction free_user_data)
-{
- DBusMessageHandler *handler;
-
- handler = dbus_new (DBusMessageHandler, 1);
-
- if (handler == NULL)
- return NULL;
-
- handler->refcount.value = 1;
- handler->function = function;
- handler->user_data = user_data;
- handler->free_user_data = free_user_data;
- handler->connections = NULL;
-
- return handler;
-}
-
-/**
- * Increments the reference count on a message handler.
- *
- * @param handler the handler
- * @returns the handler
- */
-DBusMessageHandler *
-dbus_message_handler_ref (DBusMessageHandler *handler)
-{
- _dbus_return_if_fail (handler != NULL);
-
- _dbus_atomic_inc (&handler->refcount);
-
- return handler;
-}
-
-/**
- * Decrements the reference count on a message handler,
- * freeing the handler if the count reaches 0.
- *
- * @param handler the handler
- */
-void
-dbus_message_handler_unref (DBusMessageHandler *handler)
-{
- dbus_bool_t last_unref;
-
- _dbus_return_if_fail (handler != NULL);
-
- last_unref = (_dbus_atomic_dec (&handler->refcount) == 1);
-
- if (last_unref)
- {
- DBusList *link;
-
- if (handler->free_user_data)
- (* handler->free_user_data) (handler->user_data);
-
- link = _dbus_list_get_first_link (&handler->connections);
- while (link != NULL)
- {
- DBusConnection *connection = link->data;
-
- _dbus_connection_handler_destroyed_locked (connection, handler);
-
- link = _dbus_list_get_next_link (&handler->connections, link);
- }
-
- _dbus_list_clear (&handler->connections);
-
- dbus_free (handler);
- }
-}
-
-/**
- * Gets the user data for the handler (the same user data
- * passed to the handler function.)
- *
- * @param handler the handler
- * @returns the user data
- */
-void*
-dbus_message_handler_get_data (DBusMessageHandler *handler)
-{
- void* user_data;
-
- _dbus_return_val_if_fail (handler != NULL, NULL);
-
- _DBUS_LOCK (message_handler);
- user_data = handler->user_data;
- _DBUS_UNLOCK (message_handler);
- return user_data;
-}
-
-/**
- * Sets the user data for the handler (the same user data
- * to be passed to the handler function). Frees any previously-existing
- * user data with the previous free_user_data function.
- *
- * @param handler the handler
- * @param user_data the user data
- * @param free_user_data free function for the data
- */
-void
-dbus_message_handler_set_data (DBusMessageHandler *handler,
- void *user_data,
- DBusFreeFunction free_user_data)
-{
- DBusFreeFunction old_free_func;
- void *old_user_data;
-
- _dbus_return_if_fail (handler != NULL);
-
- _DBUS_LOCK (message_handler);
- old_free_func = handler->free_user_data;
- old_user_data = handler->user_data;
-
- handler->user_data = user_data;
- handler->free_user_data = free_user_data;
- _DBUS_UNLOCK (message_handler);
-
- if (old_free_func)
- (* old_free_func) (old_user_data);
-
-}
-
-/**
- * Sets the handler function. Call dbus_message_handler_set_data()
- * to set the user data for the function.
- *
- * @param handler the handler
- * @param function the function
- */
-void
-dbus_message_handler_set_function (DBusMessageHandler *handler,
- DBusHandleMessageFunction function)
-{
- _dbus_return_if_fail (handler != NULL);
-
- _DBUS_LOCK (message_handler);
- handler->function = function;
- _DBUS_UNLOCK (message_handler);
-}
-
-/** @} */
-
-#ifdef DBUS_BUILD_TESTS
-static DBusHandlerResult
-test_handler (DBusMessageHandler *handler,
- DBusConnection *connection,
- DBusMessage *message,
- void *user_data)
-{
- return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
-}
-
-static void
-free_test_data (void *data)
-{
- /* does nothing */
-}
-
-/**
- * @ingroup DBusMessageInternals
- * Unit test for DBusMessageHandler.
- *
- * @returns #TRUE on success.
- */
-dbus_bool_t
-_dbus_message_handler_test (const char *test_data_dir)
-{
- DBusMessageHandler *handler;
-
-#define TEST_DATA ((void*) 0xcafebabe)
-
- handler = dbus_message_handler_new (test_handler,
- TEST_DATA,
- free_test_data);
-
- _dbus_assert (handler != NULL);
- _dbus_assert (handler->function == test_handler);
-
- if (dbus_message_handler_get_data (handler) != TEST_DATA)
- _dbus_assert_not_reached ("got wrong data");
-
- dbus_message_handler_set_data (handler, NULL, NULL);
- if (dbus_message_handler_get_data (handler) != NULL)
- _dbus_assert_not_reached ("got wrong data after set");
-
- dbus_message_handler_set_function (handler, NULL);
- _dbus_assert (handler->function == NULL);
-
- dbus_message_handler_ref (handler);
- dbus_message_handler_unref (handler);
- dbus_message_handler_unref (handler);
-
- return TRUE;
-}
-#endif /* DBUS_BUILD_TESTS */
+++ /dev/null
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-message-handler.h Sender/receiver of messages.
- *
- * Copyright (C) 2002 Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.0
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
-#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
-#endif
-
-#ifndef DBUS_MESSAGE_HANDLER_H
-#define DBUS_MESSAGE_HANDLER_H
-
-#include <dbus/dbus-macros.h>
-#include <dbus/dbus-types.h>
-#include <dbus/dbus-connection.h>
-
-DBUS_BEGIN_DECLS;
-
-typedef DBusHandlerResult (* DBusHandleMessageFunction) (DBusMessageHandler *handler,
- DBusConnection *connection,
- DBusMessage *message,
- void *user_data);
-
-DBusMessageHandler* dbus_message_handler_new (DBusHandleMessageFunction function,
- void *user_data,
- DBusFreeFunction free_user_data);
-
-
-DBusMessageHandler* dbus_message_handler_ref (DBusMessageHandler *handler);
-void dbus_message_handler_unref (DBusMessageHandler *handler);
-
-
-void* dbus_message_handler_get_data (DBusMessageHandler *handler);
-void dbus_message_handler_set_data (DBusMessageHandler *handler,
- void *data,
- DBusFreeFunction free_user_data);
-void dbus_message_handler_set_function (DBusMessageHandler *handler,
- DBusHandleMessageFunction function);
-
-DBUS_END_DECLS;
-
-#endif /* DBUS_MESSAGE_HANDLER_H */
return FALSE;
}
+/** The maximum number of bytes of overhead to append to a string */
#define MAX_BYTES_OVERHEAD_TO_APPEND_A_STRING (1 + 1 + 3 + 1 + 8)
+
static dbus_bool_t
append_string_field (DBusMessage *message,
int field,
* the given parent_path. The returned array should be freed with
* dbus_free_string_array().
*
- * @param connection the connection
+ * @param tree the object tree
* @param parent_path the path to list the child handlers of
* @param child_entries returns #NULL-terminated array of children
* @returns #FALSE if no memory to allocate the child entries
return TRUE;
}
+/**
+ * Determine wether the given charater is valid as the first charater
+ * in a name.
+ */
#define VALID_INITIAL_NAME_CHARACTER(c) \
( ((c) >= 'A' && (c) <= 'Z') || \
((c) >= 'a' && (c) <= 'z') || \
((c) == '_') )
+/**
+ * Determine wether the given charater is valid as a second or later
+ * character in a nam
+ */
#define VALID_NAME_CHARACTER(c) \
( ((c) >= '0' && (c) <= '9') || \
((c) >= 'A' && (c) <= 'Z') || \
void *connection_or_server; /**< DBusConnection or DBusServer */
};
+/**
+ * Auxillary struct for pairing up a #DBusWatch and associated
+ * #GPollFD
+ */
typedef struct
{
- int refcount;
+ int refcount; /**< reference count */
- GPollFD poll_fd;
- DBusWatch *watch;
+ GPollFD poll_fd; /**< the #GPollFD to use with g_source_add_poll() */
+ DBusWatch *watch; /**< the corresponding DBusWatch*/
- unsigned int removed : 1;
+ unsigned int removed : 1; /**< true if this #WatchFD has been removed */
} WatchFD;
static WatchFD *
* @{
*/
+/**
+ * DBusGProxyManager typedef
+ */
+
typedef struct DBusGProxyManager DBusGProxyManager;
/**
*/
struct DBusGProxyClass
{
- GObjectClass parent_class;
+ GObjectClass parent_class; /**< Parent class */
};
static void dbus_gproxy_init (DBusGProxy *proxy);
/**
- * A list of proxies with a given service+path+interface, used to route incoming
- * signals.
+ * A list of proxies with a given service+path+interface, used to
+ * route incoming signals.
*/
typedef struct
{
- GSList *proxies;
+ GSList *proxies; /**< The list of proxies */
char name[4]; /**< service (empty string for none), nul byte,
* path, nul byte,
g_error ("Out of memory\n");
}
+/**
+ * Connect a signal handler to a proxy for a remote interface. When
+ * the remote interface emits the specified signal, the proxy will
+ * emit a corresponding GLib signal.
+ *
+ * @param proxy a proxy for a remote interface
+ * @param signal_name the DBus signal name to listen for
+ * @param handler the handler to connect
+ * @param data data to pass to handler
+ * @param free_data_func callback function to destroy data
+ */
void
dbus_gproxy_connect_signal (DBusGProxy *proxy,
const char *signal_name,
g_free (detail);
}
+/**
+ * Disconnect all signal handlers from a proxy that match the given
+ * criteria.
+ *
+ * @param proxy a proxy for a remote interface
+ * @param signal_name the DBus signal name to disconnect
+ * @param handler the handler to disconnect
+ * @param data the data that was registered with handler
+ */
void
dbus_gproxy_disconnect_signal (DBusGProxy *proxy,
const char *signal_name,
+++ /dev/null
-/* -*- mode: C; c-file-style: "gnu" -*- */
-#include "dbus-glib.h"
-#include <stdio.h>
-
-int
-main (int argc, char **argv)
-{
- DBusConnection *connection;
- DBusMessage *message, *reply;
- GMainLoop *loop;
- DBusError error;
-
- if (argc < 2)
- {
- g_printerr ("Give the server address as an argument\n");
- return 1;
- }
-
- loop = g_main_loop_new (NULL, FALSE);
-
- dbus_error_init (&error);
- connection = dbus_connection_open (argv[1], &error);
- if (connection == NULL)
- {
- g_printerr ("Failed to open connection to %s: %s\n", argv[1],
- error.message);
- dbus_error_free (&error);
- return 1;
- }
-
- dbus_connection_setup_with_g_main (connection, NULL);
-
- message = dbus_message_new (DBUS_MESSAGE_HELLO,
- DBUS_SERVICE_DBUS);
-
- dbus_error_init (&error);
- reply = dbus_connection_send_with_reply_and_block (connection, message, -1, &error);
- if (reply == NULL)
- {
- g_printerr ("Error on hello message: %s\n", error.message);
- dbus_error_free (&error);
- return 1;
- }
-
- g_print ("reply name: %s\n", dbus_message_get_name (reply));
-
- g_main_loop_run (loop);
-
- return 0;
-}
+++ /dev/null
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* test-profile.c Program that does basic message-response for timing
- *
- * Copyright (C) 2003 Red Hat Inc.
- *
- * Licensed under the Academic Free License version 2.0
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include <config.h>
-#include <glib.h>
-#include "dbus-glib.h"
-#include <stdlib.h>
-
-#define N_CLIENT_THREADS 1
-#define N_ITERATIONS 1000
-#define PAYLOAD_SIZE 30
-#define ECHO_MESSAGE "org.freedesktop.DBus.Test.EchoProfile"
-static const char *address;
-static unsigned char *payload;
-
-static void
-send_echo_message (DBusConnection *connection)
-{
- DBusMessage *message;
-
- message = dbus_message_new (ECHO_MESSAGE, NULL);
- dbus_message_append_args (message,
- DBUS_TYPE_STRING, "Hello World!",
- DBUS_TYPE_INT32, 123456,
-#if 1
- DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE,
- payload, PAYLOAD_SIZE,
-#endif
- DBUS_TYPE_INVALID);
-
- dbus_connection_send (connection, message, NULL);
- dbus_message_unref (message);
- dbus_connection_flush (connection);
-}
-
-static DBusHandlerResult
-client_filter (DBusMessageHandler *handler,
- DBusConnection *connection,
- DBusMessage *message,
- void *user_data)
-{
- int *iterations = user_data;
-
- if (dbus_message_has_name (message, DBUS_MESSAGE_LOCAL_DISCONNECT))
- {
- g_printerr ("Client thread disconnected\n");
- exit (1);
- }
- else if (dbus_message_has_name (message,
- ECHO_MESSAGE))
- {
- *iterations += 1;
- if (*iterations >= N_ITERATIONS)
- {
- g_print ("Completed %d iterations\n", N_ITERATIONS);
- exit (0);
- }
- send_echo_message (connection);
- }
-
- return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
-}
-
-static void*
-thread_func (void *data)
-{
- DBusError error;
- GMainContext *context;
- GMainLoop *loop;
- DBusMessageHandler *handler;
- DBusConnection *connection;
- int iterations;
-
- g_printerr ("Starting client thread\n");
-
- dbus_error_init (&error);
- connection = dbus_connection_open (address, &error);
- if (connection == NULL)
- {
- g_printerr ("could not open connection: %s\n", error.message);
- dbus_error_free (&error);
- exit (1);
- }
-
- iterations = 1;
-
- handler = dbus_message_handler_new (client_filter,
- &iterations, NULL);
-
- if (!dbus_connection_add_filter (connection,
- handler))
- g_error ("no memory");
-
- /* FIXME we leak the handler */
-
- context = g_main_context_new ();
- loop = g_main_loop_new (context, FALSE);
-
- dbus_connection_setup_with_g_main (connection, context);
-
- g_printerr ("Client thread sending message to prime pingpong\n");
- send_echo_message (connection);
- g_printerr ("Client thread sent message\n");
-
- g_printerr ("Client thread entering main loop\n");
- g_main_loop_run (loop);
- g_printerr ("Client thread exiting main loop\n");
-
- g_main_loop_unref (loop);
- g_main_context_unref (context);
-
- return NULL;
-}
-
-static DBusHandlerResult
-server_filter (DBusMessageHandler *handler,
- DBusConnection *connection,
- DBusMessage *message,
- void *user_data)
-{
- if (dbus_message_has_name (message, DBUS_MESSAGE_LOCAL_DISCONNECT))
- {
- g_printerr ("Server thread disconnected\n");
- exit (1);
- }
- else if (dbus_message_has_name (message,
- ECHO_MESSAGE))
- {
- send_echo_message (connection);
- }
-
- return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
-}
-
-static void
-new_connection_callback (DBusServer *server,
- DBusConnection *new_connection,
- void *user_data)
-{
- DBusMessageHandler *handler;
-
- dbus_connection_ref (new_connection);
- dbus_connection_setup_with_g_main (new_connection, NULL);
-
- handler = dbus_message_handler_new (server_filter,
- NULL, NULL);
-
- if (!dbus_connection_add_filter (new_connection,
- handler))
- g_error ("no memory");
-
-
- /* FIXME we leak the handler */
-}
-
-int
-main (int argc, char *argv[])
-{
- GMainLoop *loop;
- DBusError error;
- DBusServer *server;
- int i;
-
- g_thread_init (NULL);
- dbus_gthread_init ();
-
- dbus_error_init (&error);
- server = dbus_server_listen ("unix:tmpdir="DBUS_TEST_SOCKET_DIR,
- &error);
- if (server == NULL)
- {
- g_printerr ("Could not start server: %s\n",
- error.message);
- return 1;
- }
-
- address = dbus_server_get_address (server);
- payload = g_malloc (PAYLOAD_SIZE);
-
- dbus_server_set_new_connection_function (server,
- new_connection_callback,
- NULL, NULL);
-
- loop = g_main_loop_new (NULL, FALSE);
-
- dbus_server_setup_with_g_main (server, NULL);
-
- for (i = 0; i < N_CLIENT_THREADS; i++)
- {
- g_thread_create (thread_func, NULL, FALSE, NULL);
- }
-
- g_printerr ("Server thread entering main loop\n");
- g_main_loop_run (loop);
- g_printerr ("Server thread exiting main loop\n");
-
- dbus_server_unref (server);
-
- g_main_loop_unref (loop);
-
- return 0;
-}
-
+++ /dev/null
-#include <glib.h>
-#include "dbus-glib.h"
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "test-thread.h"
-
-DBusConnection *connection;
-
-static gpointer
-thread_func (gpointer data)
-{
- gint32 threadnr = GPOINTER_TO_INT (data);
- guint32 counter = 0;
- DBusMessageIter iter;
- DBusMessage *message;
- char *str;
-
- while (1)
- {
- message = dbus_message_new ("org.freedesktop.ThreadTest", NULL);
-
- dbus_message_append_iter_init (message, &iter);
-
- if (!dbus_message_iter_append_int32 (&iter, threadnr))
- {
- g_print ("thread %d: append threadnr failed\n", threadnr);
- }
-
- if (!dbus_message_iter_append_uint32 (&iter, counter))
- {
- g_print ("thread %d: append counter (%d) failed\n", threadnr, counter);
- }
-
- str = g_strdup_printf ("Thread %d-%d\n", threadnr, counter);
- if (!dbus_message_iter_append_string (&iter, str))
- {
- g_print ("thread %d: append string (%s) failed\n", threadnr, str);
- }
- g_free (str);
-
- if (!dbus_connection_send (connection,
- message,
- NULL))
- {
- g_print ("thread %d: send message failed\n", threadnr);
- }
-
- dbus_message_unref (message);
-
- counter ++;
- }
-
- return NULL;
-}
-
-int
-main (int argc, char *argv[])
-{
- GMainLoop *loop;
- DBusError error;
- int i;
-
- g_thread_init (NULL);
- dbus_gthread_init ();
-
- if(argc < 2)
- {
- g_error("Need an address as argv[1]\n");
- return 1;
- }
-
- dbus_error_init (&error);
- connection = dbus_connection_open (argv[1], &error);
- if (connection == NULL)
- {
- g_printerr ("could not open connection: %s\n", error.message);
- dbus_error_free (&error);
- return 1;
- }
-
- dbus_connection_setup_with_g_main (connection, NULL);
-
- for (i = 0; i < N_TEST_THREADS; i++)
- {
- g_thread_create (thread_func, GINT_TO_POINTER (i), FALSE, NULL);
- }
-
- loop = g_main_loop_new (NULL, FALSE);
- g_main_run (loop);
-
- return 0;
-}
-
+++ /dev/null
-#include <glib.h>
-#include "dbus-glib.h"
-#include <stdio.h>
-#include <string.h>
-
-#include "test-thread.h"
-
-typedef struct {
- guint32 counters[N_TEST_THREADS];
-} ThreadTestData;
-
-static ThreadTestData *
-thread_test_data_new (void)
-{
- ThreadTestData *data;
-
- data = g_new0 (ThreadTestData, 1);
-
- return data;
-}
-
-static void
-thread_test_data_free (ThreadTestData *data)
-{
- g_free (data);
-}
-
-static DBusMessageHandler *disconnect_handler;
-static DBusMessageHandler *filter_handler;
-static dbus_int32_t handler_slot = -1;
-
-static DBusHandlerResult
-handle_test_message (DBusMessageHandler *handler,
- DBusConnection *connection,
- DBusMessage *message,
- void *user_data)
-{
- ThreadTestData *data = user_data;
- DBusMessageIter iter;
- gint32 threadnr;
- guint32 counter;
- char *str, *expected_str;
- GString *counter_str;
- int i;
-
- dbus_message_iter_init (message, &iter);
-
- if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_INT32)
- {
- g_print ("First arg not right type\n");
- goto out;
- }
- threadnr = dbus_message_iter_get_int32 (&iter);
- if (threadnr < 0 || threadnr >= N_TEST_THREADS)
- {
- g_print ("Invalid thread nr\n");
- goto out;
- }
-
- if (! dbus_message_iter_next (&iter))
- {
- g_print ("Couldn't get second arg\n");
- goto out;
- }
-
- if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_UINT32)
- {
- g_print ("Second arg not right type\n");
- goto out;
- }
-
- counter = dbus_message_iter_get_uint32 (&iter);
-
- if (counter != data->counters[threadnr])
- {
- g_print ("Thread %d, counter %d, expected %d\n", threadnr, counter, data->counters[threadnr]);
- goto out;
- }
- data->counters[threadnr]++;
-
- if (! dbus_message_iter_next (&iter))
- {
- g_print ("Couldn't get third arg\n");
- goto out;
- }
-
- if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING)
- {
- g_print ("Third arg not right type\n");
- goto out;
- }
-
- str = dbus_message_iter_get_string (&iter);
-
- if (str == NULL)
- {
- g_print ("No third arg\n");
- goto out;
- }
-
- expected_str = g_strdup_printf ("Thread %d-%d\n", threadnr, counter);
- if (strcmp (expected_str, str) != 0)
- {
- g_print ("Wrong string '%s', expected '%s'\n", str, expected_str);
- goto out;
- }
- g_free (str);
- g_free (expected_str);
-
- if (dbus_message_iter_next (&iter))
- {
- g_print ("Extra args on end of message\n");
- goto out;
- }
-
- dbus_connection_flush (connection);
-
- counter_str = g_string_new ("");
- for (i = 0; i < N_TEST_THREADS; i++)
- {
- g_string_append_printf (counter_str, "%d ", data->counters[i]);
- }
- g_print ("%s\r", counter_str->str);
- g_string_free (counter_str, TRUE);
-
- out:
- return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
-}
-
-static DBusHandlerResult
-handle_filter (DBusMessageHandler *handler,
- DBusConnection *connection,
- DBusMessage *message,
- void *user_data)
-{
- return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
-}
-
-static DBusHandlerResult
-handle_disconnect (DBusMessageHandler *handler,
- DBusConnection *connection,
- DBusMessage *message,
- void *user_data)
-{
- g_print ("connection disconnected\n");
- dbus_connection_unref (connection);
-
- return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
-}
-
-
-static void
-new_connection_callback (DBusServer *server,
- DBusConnection *new_connection,
- void *user_data)
-{
- const char *test_messages[] = { "org.freedesktop.ThreadTest" };
- const char *disconnect_messages[] = { "org.freedesktop.Local.Disconnect" };
- DBusMessageHandler *test_message_handler;
- ThreadTestData * data;
-
- g_print ("new_connection_callback\n");
-
- dbus_connection_ref (new_connection);
- dbus_connection_setup_with_g_main (new_connection, NULL);
-
- data = thread_test_data_new ();
-
- test_message_handler =
- dbus_message_handler_new (handle_test_message,
- data, (DBusFreeFunction)thread_test_data_free);
-
- if (!dbus_connection_register_handler (new_connection,
- test_message_handler,
- test_messages, 1))
- goto nomem;
-
- if (!dbus_connection_set_data (new_connection,
- handler_slot,
- test_message_handler,
- (DBusFreeFunction)dbus_message_handler_unref))
- goto nomem;
-
- if (!dbus_connection_register_handler (new_connection,
- disconnect_handler,
- disconnect_messages, 1))
- goto nomem;
-
- if (!dbus_connection_add_filter (new_connection,
- filter_handler))
- goto nomem;
-
- return;
-
- nomem:
- g_error ("no memory to setup new connection");
-}
-
-int
-main (int argc, char *argv[])
-{
- GMainLoop *loop;
- DBusServer *server;
- DBusError error;
-
- g_thread_init (NULL);
- dbus_gthread_init ();
-
- if (argc < 2)
- {
- fprintf (stderr, "Give the server address as an argument\n");
- return 1;
- }
-
- dbus_error_init (&error);
- server = dbus_server_listen (argv[1], &error);
- if (server == NULL)
- {
- fprintf (stderr, "Failed to start server on %s: %s\n",
- argv[1], error.message);
- dbus_error_free (&error);
- return 1;
- }
-
- if (!dbus_connection_allocate_data_slot (&handler_slot))
- g_error ("no memory for data slot");
-
- filter_handler =
- dbus_message_handler_new (handle_filter, NULL, NULL);
- if (filter_handler == NULL)
- g_error ("no memory for handler");
-
- disconnect_handler =
- dbus_message_handler_new (handle_disconnect, NULL, NULL);
- if (disconnect_handler == NULL)
- g_error ("no memory for handler");
-
- dbus_server_set_new_connection_function (server,
- new_connection_callback,
- NULL, NULL);
-
- dbus_server_setup_with_g_main (server, NULL);
-
- loop = g_main_loop_new (NULL, FALSE);
- g_main_run (loop);
-
- return 0;
-}
+++ /dev/null
-#define N_TEST_THREADS 5
projects / platform / upstream / dbus.git / commitdiff