diff options
author | Havoc Pennington <hp@redhat.com> | 2004-11-26 01:53:13 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2004-11-26 01:53:13 +0000 |
commit | dbdea921b5967ed25b24a9e5af5d6a3db54c5ec7 (patch) | |
tree | e9224f077138d6e7d7c8ffe4dc4fb68ab6e0c355 /dbus/dbus-internals.c | |
parent | 2ce2ab4368d9b037c51cd3cb4ef39e3f7ade8b00 (diff) |
2004-11-25 Havoc Pennington <hp@redhat.com>
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.
Diffstat (limited to 'dbus/dbus-internals.c')
-rw-r--r-- | dbus/dbus-internals.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c index e390e4d5..6d2395fd 100644 --- a/dbus/dbus-internals.c +++ b/dbus/dbus-internals.c @@ -191,6 +191,7 @@ _dbus_verbose_real (const char *format, va_list args; static dbus_bool_t verbose = TRUE; static dbus_bool_t need_pid = TRUE; + int len; /* things are written a bit oddly here so that * in the non-verbose case we just have the one @@ -207,18 +208,16 @@ _dbus_verbose_real (const char *format, return; } + /* Print out pid before the line */ if (need_pid) - { - int len; - - fprintf (stderr, "%lu: ", _dbus_getpid ()); - - len = strlen (format); - if (format[len-1] == '\n') - need_pid = TRUE; - else - need_pid = FALSE; - } + fprintf (stderr, "%lu: ", _dbus_getpid ()); + + /* Only print pid again if the next line is a new line */ + len = strlen (format); + if (format[len-1] == '\n') + need_pid = TRUE; + else + need_pid = FALSE; va_start (args, format); vfprintf (stderr, format, args); @@ -418,6 +417,8 @@ _dbus_header_field_to_string (int header_field) return "destination"; case DBUS_HEADER_FIELD_SENDER: return "sender"; + case DBUS_HEADER_FIELD_SIGNATURE: + return "signature"; default: return "unknown"; } |