summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2018-12-14 20:06:02 +0000
committerSimon McVittie <smcv@collabora.com>2018-12-14 20:06:02 +0000
commit83034f38bea7b6c8ccbe71fa572365f0649928c2 (patch)
tree1fb2201b591a0fa43c2c6ed350af84978147fcc1
parentc3f401a6739b9374bb24c61beaa8988d80824330 (diff)
downloaddbus-83034f38bea7b6c8ccbe71fa572365f0649928c2.tar.gz
_dbus_threads_init_debug: Remove
libdbus has been thread-safe by default since 1.7.6 (2013): dbus_threads_init_default() is called on a just-in-time basis whenever needed, and _dbus_thread_init_debug() is equivalent to that. Signed-off-by: Simon McVittie <smcv@collabora.com>
-rw-r--r--bus/test-main.c3
-rw-r--r--bus/test-system.c3
-rw-r--r--dbus/dbus-internals.h3
-rw-r--r--dbus/dbus-test.c3
-rw-r--r--dbus/dbus-threads.c6
5 files changed, 0 insertions, 18 deletions
diff --git a/bus/test-main.c b/bus/test-main.c
index d2229f75..7d033050 100644
--- a/bus/test-main.c
+++ b/bus/test-main.c
@@ -108,9 +108,6 @@ main (int argc, char **argv)
_dbus_close_all ();
#endif
- if (!_dbus_threads_init_debug ())
- _dbus_test_fatal ("OOM initializing debug threads");
-
test_one ("expire-list", bus_expire_list_test);
test_one ("config-parser", bus_config_parser_test);
test_one ("signals", bus_signals_test);
diff --git a/bus/test-system.c b/bus/test-system.c
index d4311b00..8be9134f 100644
--- a/bus/test-system.c
+++ b/bus/test-system.c
@@ -64,9 +64,6 @@ main (int argc, char **argv)
_dbus_string_init_const (&test_data_dir, dir);
- if (!_dbus_threads_init_debug ())
- _dbus_test_fatal ("OOM initializing debug threads");
-
test_pre_hook ();
_dbus_test_diag ("%s: Running config file parser (trivial) test", argv[0]);
if (!bus_config_parser_trivial_test (&test_data_dir))
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 04bb8a8c..2e84f4f9 100644
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -406,9 +406,6 @@ void _dbus_unlock (DBusGlobalLock lock);
#define _DBUS_UNLOCK(name) _dbus_unlock (_DBUS_LOCK_##name)
DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_threads_init_debug (void);
-
-DBUS_PRIVATE_EXPORT
dbus_bool_t _dbus_address_append_escaped (DBusString *escaped,
const DBusString *unescaped);
diff --git a/dbus/dbus-test.c b/dbus/dbus-test.c
index ae0b791c..6342a41c 100644
--- a/dbus/dbus-test.c
+++ b/dbus/dbus-test.c
@@ -90,9 +90,6 @@ void
_dbus_run_tests (const char *test_data_dir,
const char *specific_test)
{
- if (!_dbus_threads_init_debug ())
- _dbus_test_fatal ("debug threads init failed");
-
if (test_data_dir == NULL)
test_data_dir = _dbus_getenv ("DBUS_TEST_DATA");
diff --git a/dbus/dbus-threads.c b/dbus/dbus-threads.c
index 12d40493..766bacb6 100644
--- a/dbus/dbus-threads.c
+++ b/dbus/dbus-threads.c
@@ -445,10 +445,4 @@ dbus_threads_init_default (void)
#ifdef DBUS_ENABLE_EMBEDDED_TESTS
-dbus_bool_t
-_dbus_threads_init_debug (void)
-{
- return dbus_threads_init (NULL);
-}
-
#endif /* DBUS_ENABLE_EMBEDDED_TESTS */