From 29560adcc79a259a0be3511c056ee7453aa26c04 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 13 Mar 2003 00:56:43 +0000 Subject: 2003-03-12 Havoc Pennington 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 --- test/bus-test.c | 56 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 22 deletions(-) (limited to 'test/bus-test.c') diff --git a/test/bus-test.c b/test/bus-test.c index 342e806b..e059e6cb 100644 --- a/test/bus-test.c +++ b/test/bus-test.c @@ -62,24 +62,34 @@ test_hello_client1_handler (DBusMessageHandler *handler, if (!test_hello_succeeding) goto out; + +#if 1 + printf ("In stage %d got message %s\n", + client1_stage, dbus_message_get_name (message)); +#endif if (dbus_message_name_is (message, DBUS_MESSAGE_HELLO)) { TEST_HELLO_HANDLE_FAIL (client1_stage == 0); - TEST_HELLO_HANDLE_FAIL ((dbus_message_get_args (message, - DBUS_TYPE_STRING, &client1_name, - 0) == DBUS_RESULT_SUCCESS)); + TEST_HELLO_HANDLE_FAIL (dbus_message_get_args (message, NULL, + DBUS_TYPE_STRING, &client1_name, + 0)); client1_stage += 1; } else if (dbus_message_name_is (message, DBUS_MESSAGE_SERVICE_CREATED)) { - TEST_HELLO_HANDLE_FAIL (client1_stage == 1 || client1_stage == 3); + TEST_HELLO_HANDLE_FAIL (dbus_message_get_args (message, NULL, + DBUS_TYPE_STRING, &tmp, + 0)); - TEST_HELLO_HANDLE_FAIL ((dbus_message_get_args (message, - DBUS_TYPE_STRING, &tmp, - 0) == DBUS_RESULT_SUCCESS)); +#if 0 + printf ("ServiceCreated is %s\n", tmp); +#endif + + TEST_HELLO_HANDLE_FAIL (client1_stage == 1 || client1_stage == 3); + if (client1_stage == 1) TEST_HELLO_HANDLE_FAIL (strcmp (client1_name, tmp) == 0); else @@ -94,9 +104,9 @@ test_hello_client1_handler (DBusMessageHandler *handler, { TEST_HELLO_HANDLE_FAIL (client1_stage == 2); - TEST_HELLO_HANDLE_FAIL ((dbus_message_get_args (message, - DBUS_TYPE_STRING, &tmp, - 0) == DBUS_RESULT_SUCCESS)); + TEST_HELLO_HANDLE_FAIL (dbus_message_get_args (message, NULL, + DBUS_TYPE_STRING, &tmp, + 0)); TEST_HELLO_HANDLE_FAIL (strcmp (client1_name, tmp) == 0); client1_stage += 1; @@ -132,9 +142,9 @@ test_hello_client2_handler (DBusMessageHandler *handler, { TEST_HELLO_HANDLE_FAIL (client2_stage == 0); - TEST_HELLO_HANDLE_FAIL ((dbus_message_get_args (message, - DBUS_TYPE_STRING, &client2_name, - 0) == DBUS_RESULT_SUCCESS)); + TEST_HELLO_HANDLE_FAIL (dbus_message_get_args (message, NULL, + DBUS_TYPE_STRING, &client2_name, + 0)); client2_stage += 1; } @@ -142,9 +152,9 @@ test_hello_client2_handler (DBusMessageHandler *handler, { TEST_HELLO_HANDLE_FAIL (client2_stage == 1); - TEST_HELLO_HANDLE_FAIL ((dbus_message_get_args (message, - DBUS_TYPE_STRING, &tmp, - 0) == DBUS_RESULT_SUCCESS)); + TEST_HELLO_HANDLE_FAIL (dbus_message_get_args (message, NULL, + DBUS_TYPE_STRING, &tmp, + 0)); TEST_HELLO_HANDLE_FAIL (strcmp (client2_name, tmp) == 0); client2_stage += 1; @@ -153,9 +163,9 @@ test_hello_client2_handler (DBusMessageHandler *handler, { TEST_HELLO_HANDLE_FAIL (client2_stage == 2); - TEST_HELLO_HANDLE_FAIL ((dbus_message_get_args (message, - DBUS_TYPE_STRING, &tmp, - 0) == DBUS_RESULT_SUCCESS)); + TEST_HELLO_HANDLE_FAIL (dbus_message_get_args (message, NULL, + DBUS_TYPE_STRING, &tmp, + 0)); TEST_HELLO_HANDLE_FAIL (strcmp (client2_name, tmp) == 0); client2_stage += 1; @@ -177,9 +187,9 @@ static dbus_bool_t test_hello_replies (void) { DBusConnection *connection; - DBusResultCode result; DBusMessage *message; DBusMessageHandler *handler; + DBusResultCode result; /* First start client 1 */ connection = dbus_connection_open ("debug:name=test-server", &result); @@ -188,7 +198,8 @@ test_hello_replies (void) DBUS_MESSAGE_HELLO); handler = dbus_message_handler_new (test_hello_client1_handler, NULL, NULL); dbus_connection_add_filter (connection, handler); - dbus_connection_send_message (connection, message, NULL, NULL); + if (!dbus_connection_send (connection, message, NULL)) + die ("no memory to send message"); dbus_message_unref (message); /* Then start client 2 */ @@ -198,7 +209,8 @@ test_hello_replies (void) DBUS_MESSAGE_HELLO); handler = dbus_message_handler_new (test_hello_client2_handler, NULL, NULL); dbus_connection_add_filter (connection, handler); - dbus_connection_send_message (connection, message, NULL, NULL); + if (!dbus_connection_send (connection, message, NULL)) + die ("no memory to send message"); dbus_message_unref (message); bus_test_loop_run (); -- cgit