diff options
author | Havoc Pennington <hp@redhat.com> | 2003-03-16 08:08:21 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2003-03-16 08:08:21 +0000 |
commit | ce173b29fc1e9432cb5956952afdbe775da12415 (patch) | |
tree | bafd96156eba1879568131fe97789e60fd7e6062 /dbus/dbus-internals.c | |
parent | f587ce7845edb0eb01451368d01b5bc86b5904cd (diff) |
2003-03-16 Havoc Pennington <hp@pobox.com>
Oops - test code was only testing failure of around 30 of the
mallocs in the test path, but it turns out there are 500+
mallocs. I believe this was due to misguided linking setup such
that there was one copy of dbus_malloc etc. in the daemon and one
in the shared lib, and only daemon mallocs were tested. In any
case, the test case now tests all 500+ mallocs, and doesn't pass
yet, though there are lots of fixes in this patch.
* dbus/dbus-connection.c (dbus_connection_dispatch_message): fix
this so that it doesn't need to allocate memory, since it
has no way of indicating failure due to OOM (and would be
annoying if it did).
* dbus/dbus-list.c (_dbus_list_pop_first_link): new function
* bus/Makefile.am: rearrange to create two self-contained
libraries, to avoid having libraries with overlapping symbols.
that was resulting in weirdness, e.g. I'm pretty sure there
were two copies of global static variables.
* dbus/dbus-internals.c: move the malloc debug stuff to
dbus-memory.c
* dbus/dbus-list.c (free_link): free list mempool if it becomes
empty.
* dbus/dbus-memory.c (_dbus_disable_mem_pools): new function
* dbus/dbus-address.c (dbus_parse_address): free list nodes
on failure.
* bus/dispatch.c (bus_dispatch_add_connection): free
message_handler_slot when no longer using it, so
memory leak checkers are happy for the test suite.
* dbus/dbus-server-debug-pipe.c (debug_finalize): free server name
* bus/bus.c (new_connection_callback): disconnect in here if
bus_connections_setup_connection fails.
* bus/connection.c (bus_connections_unref): fix to free the
connections
(bus_connections_setup_connection): if this fails, don't
disconnect the connection, just be sure there are no side
effects.
* dbus/dbus-string.c (undo_alignment): unbreak this
* dbus/dbus-auth.c (_dbus_auth_unref): free some stuff we were
leaking
(_dbus_auth_new): fix the order in which we free strings
on OOM failure
* bus/connection.c (bus_connection_disconnected): fix to
not send ServiceDeleted multiple times in case of memory
allocation failure
* dbus/dbus-bus.c (dbus_bus_get_base_service): new function to
get the base service name
(dbus_bus_register_client): don't return base service name,
instead store it on the DBusConnection and have an accessor
function for it.
(dbus_bus_register_client): rename dbus_bus_register()
* bus/dispatch.c (check_hello_message): verify that other
connections on the bus also got the correct results, not
just the one sending hello
Diffstat (limited to 'dbus/dbus-internals.c')
-rw-r--r-- | dbus/dbus-internals.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c index acd6d72f..5153a767 100644 --- a/dbus/dbus-internals.c +++ b/dbus/dbus-internals.c @@ -291,56 +291,4 @@ _dbus_type_to_string (int type) } } -#ifdef DBUS_BUILD_TESTS -static int fail_alloc_counter = _DBUS_INT_MAX; -/** - * Sets the number of allocations until we simulate a failed - * allocation. If set to 0, the next allocation to run - * fails; if set to 1, one succeeds then the next fails; etc. - * Set to _DBUS_INT_MAX to not fail anything. - * - * @param until_next_fail number of successful allocs before one fails - */ -void -_dbus_set_fail_alloc_counter (int until_next_fail) -{ - fail_alloc_counter = until_next_fail; -} - -/** - * Gets the number of successful allocs until we'll simulate - * a failed alloc. - * - * @returns current counter value - */ -int -_dbus_get_fail_alloc_counter (void) -{ - return fail_alloc_counter; -} - -/** - * Called when about to alloc some memory; if - * it returns #TRUE, then the allocation should - * fail. If it returns #FALSE, then the allocation - * should not fail. - * - * @returns #TRUE if this alloc should fail - */ -dbus_bool_t -_dbus_decrement_fail_alloc_counter (void) -{ - if (fail_alloc_counter <= 0) - { - fail_alloc_counter = _DBUS_INT_MAX; - return TRUE; - } - else - { - fail_alloc_counter -= 1; - return FALSE; - } -} -#endif /* DBUS_BUILD_TESTS */ - /** @} */ |