diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/name-test/Makefile.am | 9 | ||||
-rwxr-xr-x | test/name-test/run-test.sh | 3 | ||||
-rw-r--r-- | test/name-test/test-threads-init.c | 181 |
3 files changed, 191 insertions, 2 deletions
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index 34dd85a8..41bb24be 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -16,10 +16,10 @@ if DBUS_BUILD_TESTS ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we ## build even when not doing "make check" -noinst_PROGRAMS=test-names test-pending-call-dispatch +noinst_PROGRAMS=test-names test-pending-call-dispatch test-threads-init test_names_SOURCES= \ - test-names.c + test-names.c test_names_LDADD=$(top_builddir)/dbus/libdbus-1.la $(top_builddir)/dbus/libdbus-convenience.la @@ -29,5 +29,10 @@ test_pending_call_dispatch_SOURCES = \ test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-1.la $(top_builddir)/dbus/libdbus-convenience.la +test_threads_init_SOURCES = \ + test-threads-init.c + +test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-1.la $(top_builddir)/dbus/libdbus-convenience.la + endif diff --git a/test/name-test/run-test.sh b/test/name-test/run-test.sh index 6c612499..81e2e84e 100755 --- a/test/name-test/run-test.sh +++ b/test/name-test/run-test.sh @@ -31,3 +31,6 @@ libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-names || di echo "running test-pending-call-dispatch" libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-pending-call-dispatch || die "test-client failed" + +echo "running test-threads-init" +libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-threads-init || die "test-client failed" diff --git a/test/name-test/test-threads-init.c b/test/name-test/test-threads-init.c new file mode 100644 index 00000000..e6743cce --- /dev/null +++ b/test/name-test/test-threads-init.c @@ -0,0 +1,181 @@ +/** +* Test to make sure late thread initialization works +**/ + +#include <dbus/dbus.h> +#include <dbus/dbus-sysdeps.h> +#include <stdio.h> +#include <stdlib.h> + +#include <dbus/dbus-internals.h> + +static void +_run_iteration (DBusConnection *conn) +{ + DBusPendingCall *echo_pending; + DBusPendingCall *dbus_pending; + DBusMessage *method; + DBusMessage *reply; + char *echo = "echo"; + + /* send the first message */ + method = dbus_message_new_method_call ("org.freedesktop.DBus.TestSuiteEchoService", + "/org/freedesktop/TestSuite", + "org.freedesktop.TestSuite", + "Echo"); + + dbus_message_append_args (method, DBUS_TYPE_STRING, &echo, NULL); + dbus_connection_send_with_reply (conn, method, &echo_pending, -1); + dbus_message_unref (method); + + /* send the second message */ + method = dbus_message_new_method_call (DBUS_SERVICE_DBUS, + DBUS_PATH_DBUS, + "org.freedesktop.Introspectable", + "Introspect"); + + dbus_connection_send_with_reply (conn, method, &dbus_pending, -1); + dbus_message_unref (method); + + /* block on the second message (should return immediately) */ + dbus_pending_call_block (dbus_pending); + + /* block on the first message */ + /* if it does not return immediately chances + are we hit the block in poll bug */ + dbus_pending_call_block (echo_pending); + + /* check the reply only to make sure we + are not getting errors unrelated + to the block in poll bug */ + reply = dbus_pending_call_steal_reply (echo_pending); + + if (reply == NULL) + { + printf ("Failed: Reply is NULL ***\n"); + exit (1); + } + + if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR) + { + printf ("Failed: Reply is error: %s ***\n", dbus_message_get_error_name (reply)); + exit (1); + } + + dbus_message_unref (reply); + dbus_pending_call_unref (dbus_pending); + dbus_pending_call_unref (echo_pending); + +} +static void +check_mutex_lock (DBusMutex *mutex1, + DBusMutex *mutex2, + dbus_bool_t is_same) +{ + _dbus_assert (mutex1 != NULL); + _dbus_assert (mutex2 != NULL); + + if (is_same) + { + _dbus_assert (mutex1 == mutex2); + } + else + { + _dbus_assert (mutex1 != mutex2); + } +} + +static void +check_condvar_lock (DBusCondVar *condvar1, + DBusCondVar *condvar2, + dbus_bool_t is_same) +{ + _dbus_assert (condvar1 != NULL); + _dbus_assert (condvar2 != NULL); + + if (is_same) + { + _dbus_assert (condvar1 == condvar2); + } + else + { + _dbus_assert (condvar1 != condvar2); + } +} + + +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; + DBusMutex *mutex1, *dispatch_mutex1, *io_path_mutex1; + DBusCondVar *dispatch_cond1, *io_path_cond1; + DBusMutex *mutex2, *dispatch_mutex2, *io_path_mutex2; + DBusCondVar *dispatch_cond2, *io_path_cond2; + + printf ("*** Testing late thread init\n"); + + dbus_error_init (&error); + + conn = dbus_bus_get (DBUS_BUS_SESSION, &error); + + _dbus_connection_test_get_locks (conn, &mutex1, + &dispatch_mutex1, + &io_path_mutex1, + &dispatch_cond1, + &io_path_cond1); + _run_iteration (conn); + _dbus_connection_test_get_locks (conn, &mutex2, + &dispatch_mutex2, + &io_path_mutex2, + &dispatch_cond2, + &io_path_cond2); + + check_mutex_lock (mutex1, mutex2, TRUE); + check_mutex_lock (dispatch_mutex1, dispatch_mutex2, TRUE); + check_mutex_lock (io_path_mutex1, io_path_mutex2, TRUE); + check_condvar_lock (dispatch_cond1, dispatch_cond2, TRUE); + check_condvar_lock (io_path_cond1, io_path_cond2, TRUE); + + _dbus_threads_init_debug (); + + _dbus_connection_test_get_locks (conn, &mutex1, + &dispatch_mutex1, + &io_path_mutex1, + &dispatch_cond1, + &io_path_cond1); + + check_mutex_lock (mutex1, mutex2, FALSE); + check_mutex_lock (dispatch_mutex1, dispatch_mutex2, FALSE); + check_mutex_lock (io_path_mutex1, io_path_mutex2, FALSE); + check_condvar_lock (dispatch_cond1, dispatch_cond2, FALSE); + check_condvar_lock (io_path_cond1, io_path_cond2, FALSE); + + _run_iteration (conn); + _dbus_connection_test_get_locks (conn, &mutex2, + &dispatch_mutex2, + &io_path_mutex2, + &dispatch_cond2, + &io_path_cond2); + + check_mutex_lock (mutex1, mutex2, TRUE); + check_mutex_lock (dispatch_mutex1, dispatch_mutex2, TRUE); + check_mutex_lock (io_path_mutex1, io_path_mutex2, TRUE); + check_condvar_lock (dispatch_cond1, dispatch_cond2, TRUE); + check_condvar_lock (io_path_cond1, io_path_cond2, TRUE); + + method = dbus_message_new_method_call ("org.freedesktop.TestSuiteEchoService", + "/org/freedesktop/TestSuite", + "org.freedesktop.TestSuite", + "Exit"); + dbus_connection_send (conn, method, NULL); + dbus_message_unref (method); + + printf ("Success ***\n"); + exit (0); +} |