From d4e80132af03363a2f861cfd611847ee8758aed9 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 12 May 2003 02:44:45 +0000 Subject: 2003-05-11 Havoc Pennington * dbus/dbus-marshal.c (_dbus_marshal_validate_arg): fix to avoid calling _dbus_marshal_validate_arg() for every byte in a byte array, etc. * dbus/dbus-message-handler.c: use atomic reference counting to reduce number of locks slightly; the global lock in here sucks * dbus/dbus-connection.c (_dbus_connection_update_dispatch_status_and_unlock): variant of update_dispatch_status that can be called with lock held; then use in a couple places to reduce locking/unlocking (dbus_connection_send): hold the lock over the whole function instead of acquiring it twice. * dbus/dbus-timeout.c (_dbus_timeout_new): handle OOM * bus/connection.c (bus_connections_setup_connection): fix access to already-freed memory. * dbus/dbus-connection.c: keep a little cache of linked list nodes, to avoid using the global linked list alloc lock in the normal send-message case. Instead we just use the connection lock that we already have to take. * dbus/dbus-list.c (_dbus_list_find_last): new function * dbus/dbus-sysdeps.c (_dbus_atomic_inc, _dbus_atomic_dec): change to use a struct for the atomic type; fix docs, they return value before increment, not after increment. * dbus/dbus-string.c (_dbus_string_append_4_aligned) (_dbus_string_append_8_aligned): new functions to try to microoptimize this operation. (reallocate_for_length): break this out of set_length(), to improve profile info, and also so we can consider inlining the set_length() part. * dbus/dbus-message.c (dbus_message_new_empty_header): init data strings with some preallocation, cuts down on our calls to realloc a fair bit. Though if we can get the "move entire string to empty string" optimization below to kick in here, it would be better. * dbus/dbus-string.c (_dbus_string_move): just call _dbus_string_move_len (_dbus_string_move_len): add a special case for moving an entire string into an empty string; we can just swap the string data instead of doing any reallocs. (_dbus_string_init_preallocated): new function --- dbus/dbus-sysdeps.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'dbus/dbus-sysdeps.c') diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index c813a83c..e2975c30 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -1792,19 +1792,18 @@ _dbus_getgid (void) _DBUS_DEFINE_GLOBAL_LOCK (atomic); - #ifdef DBUS_USE_ATOMIC_INT_486 /* Taken from CVS version 1.7 of glibc's sysdeps/i386/i486/atomicity.h */ /* Since the asm stuff here is gcc-specific we go ahead and use "inline" also */ -static inline dbus_atomic_t -atomic_exchange_and_add (volatile dbus_atomic_t *atomic, - volatile dbus_atomic_t val) +static inline dbus_int32_t +atomic_exchange_and_add (DBusAtomic *atomic, + volatile dbus_int32_t val) { - register dbus_atomic_t result; + register dbus_int32_t result; __asm__ __volatile__ ("lock; xaddl %0,%1" - : "=r" (result), "=m" (*atomic) - : "0" (val), "m" (*atomic)); + : "=r" (result), "=m" (atomic->value) + : "0" (val), "m" (atomic->value)); return result; } #endif @@ -1813,12 +1812,12 @@ atomic_exchange_and_add (volatile dbus_atomic_t *atomic, * Atomically increments an integer * * @param atomic pointer to the integer to increment - * @returns the value after incrementing + * @returns the value before incrementing * * @todo implement arch-specific faster atomic ops */ -dbus_atomic_t -_dbus_atomic_inc (volatile dbus_atomic_t *atomic) +dbus_int32_t +_dbus_atomic_inc (DBusAtomic *atomic) { #ifdef DBUS_USE_ATOMIC_INT_486 return atomic_exchange_and_add (atomic, 1); @@ -1837,12 +1836,12 @@ _dbus_atomic_inc (volatile dbus_atomic_t *atomic) * Atomically decrement an integer * * @param atomic pointer to the integer to decrement - * @returns the value after decrementing + * @returns the value before decrementing * * @todo implement arch-specific faster atomic ops */ -dbus_atomic_t -_dbus_atomic_dec (volatile dbus_atomic_t *atomic) +dbus_int32_t +_dbus_atomic_dec (DBusAtomic *atomic) { #ifdef DBUS_USE_ATOMIC_INT_486 return atomic_exchange_and_add (atomic, -1); -- cgit