From dbdea921b5967ed25b24a9e5af5d6a3db54c5ec7 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 26 Nov 2004 01:53:13 +0000 Subject: 2004-11-25 Havoc Pennington The primary change here is to always write() once before adding the write watch, which gives us about a 10% performance increase. * dbus/dbus-transport-unix.c: a number of modifications to cope with removing messages_pending (check_write_watch): properly handle DBUS_AUTH_STATE_WAITING_FOR_MEMORY; adapt to removal of messages_pending stuff (check_read_watch): properly handle WAITING_FOR_MEMORY and AUTHENTICATED cases (unix_handle_watch): after writing, see if the write watch can be removed (unix_do_iteration): assert that write_watch/read_watch are non-NULL rather than testing that they aren't, since they aren't allowed to be NULL. check_write_watch() at the end so we add the watch if we did not finish writing (e.g. got EAGAIN) * dbus/dbus-transport-protected.h: remove messages_pending call, since it resulted in too much inefficient watch adding/removing; instead we now require that the transport user does an iteration after queueing outgoing messages, and after trying the first write() we add a write watch if we got EAGAIN or exceeded our max bytes to write per iteration setting * dbus/dbus-string.c (_dbus_string_validate_signature): add this function * dbus/dbus-server-unix.c (unix_finalize): the socket name was freed and then accessed, valgrind flagged this bug, fix it * dbus/dbus-message.c: fix several bugs where HEADER_FIELD_LAST was taken as the last valid field plus 1, where really it is equal to the last valid field. Corrects some message corruption issues. * dbus/dbus-mainloop.c: verbosity changes * dbus/dbus-keyring.c (_dbus_keyring_new_homedir): handle OOM instead of aborting in one of the test codepaths * dbus/dbus-internals.c (_dbus_verbose_real): fix a bug that caused not printing the pid ever again if a verbose was missing the newline at the end (_dbus_header_field_to_string): add HEADER_FIELD_SIGNATURE * dbus/dbus-connection.c: verbosity changes; (dbus_connection_has_messages_to_send): new function (_dbus_connection_message_sent): no longer call transport->messages_pending (_dbus_connection_send_preallocated_unlocked): do one iteration to try to write() immediately, so we can avoid the write watch. This is the core purpose of this patchset (_dbus_connection_get_dispatch_status_unlocked): if disconnected, dump the outgoing message queue, so nobody will get confused trying to send them or thinking stuff is pending to be sent * bus/test.c: verbosity changes * bus/driver.c: verbosity/assertion changes * bus/dispatch.c: a bunch of little tweaks to get it working again because this patchset changes when/where you need to block. --- dbus/dbus-transport.c | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'dbus/dbus-transport.c') diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c index da487cc7..1a9da4a3 100644 --- a/dbus/dbus-transport.c +++ b/dbus/dbus-transport.c @@ -141,7 +141,6 @@ _dbus_transport_init_base (DBusTransport *transport, transport->auth = auth; transport->live_messages_size = counter; transport->authenticated = FALSE; - transport->messages_need_sending = FALSE; transport->disconnected = FALSE; transport->send_credentials_pending = !server; transport->receive_credentials_pending = server; @@ -610,32 +609,6 @@ _dbus_transport_set_connection (DBusTransport *transport, return transport->connection != NULL; } -/** - * Notifies the transport when the outgoing message queue goes from - * empty to non-empty or vice versa. Typically causes the transport to - * add or remove its DBUS_WATCH_WRITABLE watch. - * - * @param transport the transport. - * @param queue_length the length of the outgoing message queue. - * - */ -void -_dbus_transport_messages_pending (DBusTransport *transport, - int queue_length) -{ - _dbus_assert (transport->vtable->messages_pending != NULL); - - if (transport->disconnected) - return; - - transport->messages_need_sending = queue_length > 0; - - _dbus_transport_ref (transport); - (* transport->vtable->messages_pending) (transport, - queue_length); - _dbus_transport_unref (transport); -} - /** * Get the UNIX file descriptor, if any. * -- cgit