diff options
author | Havoc Pennington <hp@redhat.com> | 2006-10-01 15:36:19 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2006-10-01 15:36:19 +0000 |
commit | a2129f7cccaf0265fffe0da79ca0510b6e01131b (patch) | |
tree | a1d889dfa99ffb86f62d87bca77d1c5b345ebfdb /test | |
parent | eef10bc3c4b0a084477e713963d0a3121d652e3c (diff) |
2006-10-01 Havoc Pennington <hp@redhat.com>
* dbus/dbus-connection.c (_dbus_connection_close_if_only_one_ref):
Add a hack to make DBusNewConnectionFunction work right.
* dbus/dbus-server-socket.c (handle_new_client_fd_and_unlock): use
the hack here. Also, fix the todo about refcount leak.
* dbus/dbus-server-debug-pipe.c (_dbus_transport_debug_pipe_new):
and use the hack here
* dbus/dbus-connection.c: Kill the "shared" flag vs. the
"shareable" flag; this was completely broken, since it meant
dbus_connection_open() returned a connection of unknown
shared-ness. Now, we always hold a ref on anything opened
as shareable.
Move the call to notify dbus-bus.c into
connection_forget_shared_unlocked, so libdbus consistently forgets
all its knowledge of a connection at once. This exposed numerous
places where things were totally broken if we dropped a ref inside
get_dispatch_status_unlocked where
connection_forget_shared_unlocked was previously, so move
connection_forget_shared_unlocked into
_dbus_connection_update_dispatch_status_and_unlock. Also move the
exit_on_disconnect here.
(shared_connections_shutdown): this assumed weak refs to the
shared connections; since we have strong refs now, the assertion
was failing and stuff was left in the hash. Fix it to close
still-open shared connections.
* bus/dispatch.c: fixup to use dbus_connection_open_private on the
debug pipe connections
* dbus/dbus-connection.c (dbus_connection_dispatch): only notify
dbus-bus.c if the closed connection is in fact shared
(_dbus_connection_close_possibly_shared): rename from
_dbus_connection_close_internal
(dbus_connection_close, dbus_connection_open,
dbus_connection_open_private): Improve docs to explain the deal
with when you should close or unref or both
* dbus/dbus-bus.c
(_dbus_bus_notify_shared_connection_disconnected_unlocked): rename
from _dbus_bus_check_connection_and_unref_unlocked and modify to
loop over all connections
* test/test-utils.c (test_connection_shutdown): don't try to close
shared connections.
* test/name-test/test-threads-init.c (main): fix warnings in here
* dbus/dbus-sysdeps.c (_dbus_abort): support DBUS_BLOCK_ON_ABORT
env variable to cause blocking waiting for gdb; drop
DBUS_PRINT_BACKTRACE and just call _dbus_print_backtrace()
unconditionally.
* configure.in: add -export-dynamic to libtool flags if assertions enabled
so _dbus_print_backtrace works.
* dbus/dbus-sysdeps-unix.c (_dbus_print_backtrace): use fprintf
instead of _dbus_verbose to print the backtrace, and diagnose lack
of -rdynamic/-export-dynamic
Diffstat (limited to 'test')
-rw-r--r-- | test/Makefile.am | 7 | ||||
-rw-r--r-- | test/name-test/Makefile.am | 4 | ||||
-rw-r--r-- | test/name-test/test-threads-init.c | 8 | ||||
-rw-r--r-- | test/test-utils.c | 2 |
4 files changed, 13 insertions, 8 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 5c897797..1416f82a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -62,12 +62,19 @@ decode_gcov_SOURCES= \ TEST_LIBS=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la test_service_LDADD=$(TEST_LIBS) +test_service_LDFLAGS=@R_DYNAMIC_LDFLAG@ test_names_LDADD=$(TEST_LIBS) +test_names_LDFLAGS=@R_DYNAMIC_LDFLAG@ ## break_loader_LDADD= $(TEST_LIBS) +## break_loader_LDFLAGS=@R_DYNAMIC_LDFLAG@ test_shell_service_LDADD=$(TEST_LIBS) +test_shell_service_LDFLAGS=@R_DYNAMIC_LDFLAG@ shell_test_LDADD=$(TEST_LIBS) +shell_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ spawn_test_LDADD=$(TEST_LIBS) +spawn_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ decode_gcov_LDADD=$(TEST_LIBS) +decode_gcov_LDFLAGS=@R_DYNAMIC_LDFLAG@ EXTRA_DIST= diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index f4dc5343..75b20377 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -22,17 +22,19 @@ test_names_SOURCES= \ test-names.c test_names_LDADD=$(top_builddir)/dbus/libdbus-1.la $(top_builddir)/dbus/libdbus-convenience.la +test_names_LDFLAGS=@R_DYNAMIC_LDFLAG@ test_pending_call_dispatch_SOURCES = \ test-pending-call-dispatch.c test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-1.la $(top_builddir)/dbus/libdbus-convenience.la - +test_pending_call_dispatch_LDFLAGS=@R_DYNAMIC_LDFLAG@ test_threads_init_SOURCES = \ test-threads-init.c test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-1.la $(top_builddir)/dbus/libdbus-convenience.la +test_threads_init_LDFLAGS=@R_DYNAMIC_LDFLAG@ endif diff --git a/test/name-test/test-threads-init.c b/test/name-test/test-threads-init.c index e6743cce..f059993b 100644 --- a/test/name-test/test-threads-init.c +++ b/test/name-test/test-threads-init.c @@ -1,6 +1,6 @@ /** -* Test to make sure late thread initialization works -**/ + * Test to make sure late thread initialization works + */ #include <dbus/dbus.h> #include <dbus/dbus-sysdeps.h> @@ -8,6 +8,7 @@ #include <stdlib.h> #include <dbus/dbus-internals.h> +#include <dbus/dbus-connection-internal.h> static void _run_iteration (DBusConnection *conn) @@ -107,9 +108,6 @@ check_condvar_lock (DBusCondVar *condvar1, int main (int argc, char *argv[]) { - long start_tv_sec, start_tv_usec; - long end_tv_sec, end_tv_usec; - int i; DBusMessage *method; DBusConnection *conn; DBusError error; diff --git a/test/test-utils.c b/test/test-utils.c index 3577bf9c..9665eda3 100644 --- a/test/test-utils.c +++ b/test/test-utils.c @@ -171,8 +171,6 @@ void test_connection_shutdown (DBusLoop *loop, DBusConnection *connection) { - _dbus_connection_close_internal (connection); - if (!dbus_connection_set_watch_functions (connection, NULL, NULL, |