mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-21 12:08:09 +02:00
29560adcc7
Mega-patch that gets the message bus daemon initially handling out-of-memory. Work still needed. Also lots of random moving stuff to DBusError instead of ResultCode. * dbus/dbus-list.c (_dbus_list_length_is_one): new function * dbus/dbus-connection.c (dbus_connection_send_with_reply_and_block): use DBusError * dbus/dbus-bus.c: adapt to API changes, make it use DBusError not DBusResultCode * dbus/dbus-connection.c (dbus_connection_send): drop the result code here, as the only failure possible is OOM. * bus/connection.c (bus_connection_disconnect): rename bus_connection_disconnected as it's a notification only * bus/driver.c (bus_driver_handle_acquire_service): don't free "name" on get_args failure, should be done by get_args; don't disconnect client for bad args, just return an error. (bus_driver_handle_service_exists): ditto * bus/services.c (bus_services_list): NULL-terminate returned array * bus/driver.c (bus_driver_send_service_lost) (bus_driver_send_service_acquired): send messages from driver to a specific client to the client's unique name, not to the broadcast service. * dbus/dbus-message.c (decode_header_data): reject messages that contain no name field (_dbus_message_get_client_serial): rename to dbus_message_get_serial and make public (_dbus_message_set_serial): rename from set_client_serial (_dbus_message_set_reply_serial): make public (_dbus_message_get_reply_serial): make public * bus/connection.c (bus_connection_foreach): allow stopping iteration by returning FALSE from foreach function. * dbus/dbus-connection.c (dbus_connection_send_preallocated) (dbus_connection_free_preallocated_send) (dbus_connection_preallocate_send): new API for sending a message without possibility of malloc failure. (dbus_connection_send_message): rename to just dbus_connection_send (and same for whole function family) * dbus/dbus-errors.c (dbus_error_free): make this reinit the error * dbus/dbus-sysdeps.c (_dbus_exit): new function * bus/activation.c: handle/return errors * dbus/dbus-errors.h: add more DBUS_ERROR #define * dbus/dbus-sysdeps.c (_dbus_directory_open) (_dbus_file_get_contents) (_dbus_directory_get_next_file): use DBusError instead of DBusResultCode (_dbus_result_from_errno): move to this file
90 lines
1.8 KiB
C
90 lines
1.8 KiB
C
#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;
|
|
DBusMessage *message;
|
|
char *str;
|
|
|
|
while (1)
|
|
{
|
|
message = dbus_message_new (NULL, "org.freedesktop.ThreadTest");
|
|
|
|
if (!dbus_message_append_int32 (message, threadnr))
|
|
{
|
|
g_print ("thread %d: append threadnr failed\n", threadnr);
|
|
}
|
|
|
|
if (!dbus_message_append_uint32 (message, 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_append_string (message, 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;
|
|
DBusResultCode result;
|
|
int i;
|
|
|
|
g_thread_init (NULL);
|
|
dbus_gthread_init ();
|
|
|
|
if(argc < 2)
|
|
{
|
|
g_error("Need an address as argv[1]\n");
|
|
return 1;
|
|
}
|
|
|
|
connection = dbus_connection_open (argv[1], &result);
|
|
if (connection == NULL)
|
|
{
|
|
g_printerr ("could not open connection\n");
|
|
return 1;
|
|
}
|
|
|
|
dbus_connection_setup_with_g_main (connection);
|
|
|
|
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;
|
|
}
|
|
|