diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2006-11-14 18:56:43 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2006-11-14 18:56:43 +0000 |
| commit | 2d760baacebcabf276261eb8999a7d29cefc3ac5 (patch) | |
| tree | 8abe9156a48cb6c1d2659688a0763989e5b82669 | |
| parent | 31c79c0e35546de06b1e435958c3d922320f7e65 (diff) | |
* dbus/dbus-threads.h: fix DBUS_THREAD_FUNCTIONS_ALL_MASK to have
the correct value so we don't assert when initalizing recursive threads
* test/name-test/test-thread-init.c: call dbus_threads_init_default
instead of _dbus_threads_init_debug since it is more of a real world
test
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | dbus/dbus-threads.h | 2 | ||||
| -rw-r--r-- | test/name-test/test-threads-init.c | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2006-11-14 John (J5) Palmieri <johnp@redhat.com> + + * dbus/dbus-threads.h: fix DBUS_THREAD_FUNCTIONS_ALL_MASK to have + the correct value so we don't assert when initalizing recursive threads + + * test/name-test/test-thread-init.c: call dbus_threads_init_default + instead of _dbus_threads_init_debug since it is more of a real world + test + 2006-11-09 John (J5) Palmieri <johnp@redhat.com> * Released 1.0.0 diff --git a/dbus/dbus-threads.h b/dbus/dbus-threads.h index 1cf533d6..2a7b32c3 100644 --- a/dbus/dbus-threads.h +++ b/dbus/dbus-threads.h @@ -134,7 +134,7 @@ typedef enum DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_FREE_MASK = 1 << 11, DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_LOCK_MASK = 1 << 12, DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_UNLOCK_MASK = 1 << 13, - DBUS_THREAD_FUNCTIONS_ALL_MASK = (1 << 13) - 1 + DBUS_THREAD_FUNCTIONS_ALL_MASK = (1 << 14) - 1 } DBusThreadFunctionsMask; /** diff --git a/test/name-test/test-threads-init.c b/test/name-test/test-threads-init.c index f059993b..8cda413c 100644 --- a/test/name-test/test-threads-init.c +++ b/test/name-test/test-threads-init.c @@ -140,7 +140,7 @@ main (int argc, char *argv[]) check_condvar_lock (dispatch_cond1, dispatch_cond2, TRUE); check_condvar_lock (io_path_cond1, io_path_cond2, TRUE); - _dbus_threads_init_debug (); + dbus_threads_init_default (); _dbus_connection_test_get_locks (conn, &mutex1, &dispatch_mutex1, |