From fe4018941190f8bf020e4a8ed2999c212e0e113d Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Sat, 15 Feb 2003 16:25:08 +0000
Subject: 2003-02-15  Alexander Larsson  <alexl@redhat.com>

	* dbus/dbus-threads.c:
	* dbus/dbus-threads.h:
	Add condvars. Remove static mutext from API.
	Implement static mutexes by initializing them from threads_init.

	* glib/dbus-gthread.c:
	* qt/dbus-qthread.cpp:
	Update with the thread api changes.


	* dbus/dbus-list.c:
	* dbus/dbus-list.h:
	Turn StaticMutex into normal mutex + init function.
	Export new functions _dbus_list_alloc_link, _dbus_list_free_link,
	_dbus_list_append_link, _dbus_list_prepend_link


	* dbus/dbus-sysdeps.c:
	* dbus/dbus-sysdeps.h:
	New type dbus_atomic_t, and new functions _dbus_atomic_inc,
	_dbus_atomic_dec. Only slow fallback implementation at the moment.

	* dbus/dbus-protocol.h:
	Add DBUS_MESSAGE_LOCAL_DISCONNECT define

	* dbus/dbus-message.c:
	Make ref/unref atomic.
	Fix some docs.

	* dbus/dbus-connection-internal.h:
	* dbus/dbus-connection.c:
	* dbus/dbus-connection.h:
	Make threadsafe.
	Change _peek to _borrow,_return & _steal_borrowed.
	Change disconnect callback to event.
	Make dbus_connection_dispatch_messages reentrant.

	* dbus/dbus-transport.c:
	Don't ref the connection on calls to the transport
	implementation.

	* dbus/dbus-message-handler.c:
	Make threadsafe.

	* glib/dbus-gmain.c:
	Don't use peek_message anymore

	* test/Makefile.am:
	* test/debug-thread.c:
	* test/debug-thread.h:
	Simple thread implementation that asserts() on deadlocks in
	single-threaded code.

	* test/bus-test.c:
	(main) Call debug_threads_init.

	* test/watch.c:
	Use disconnect message instead of disconnect callback.

	* bus/connection.c:
	* bus/connection.h:
	Don't call dbus_connection_set_disconnect_function. Instead export
	bus_connection_disconnect.

	* bus/dispatch.c:
	Call bus_connection_disconnect when we get a disconnected message.
---
 qt/dbus-qthread.cpp | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 1 deletion(-)

(limited to 'qt')

diff --git a/qt/dbus-qthread.cpp b/qt/dbus-qthread.cpp
index 5aa0fa1e..840f16e2 100644
--- a/qt/dbus-qthread.cpp
+++ b/qt/dbus-qthread.cpp
@@ -31,17 +31,39 @@ static void        dbus_qmutex_free   (DBusMutex *mutex);
 static dbus_bool_t dbus_qmutex_lock   (DBusMutex *mutex);
 static dbus_bool_t dbus_qmutex_unlock (DBusMutex *mutex);
 
+static DBusCondVar*dbus_qcondvar_new          (void);
+static void        dbus_qcondvar_free         (DBusCondVar *cond);
+static void        dbus_qcondvar_wait         (DBusCondVar *cond,
+					       DBusMutex   *mutex);
+static dbus_bool_t dbus_qcondvar_wait_timeout (DBusCondVar *cond,
+					       DBusMutex   *mutex.
+					       int          timeout_msec);
+static void        dbus_qcondvar_wake_one     (DBusCondVar *cond);
+static void        dbus_qcondvar_wake_all     (DBusCondVar *cond);
+
 
 static const DBusThreadFunctions functions =
 {
   DBUS_THREAD_FUNCTIONS_NEW_MASK |
   DBUS_THREAD_FUNCTIONS_FREE_MASK |
   DBUS_THREAD_FUNCTIONS_LOCK_MASK |
-  DBUS_THREAD_FUNCTIONS_UNLOCK_MASK,
+  DBUS_THREAD_FUNCTIONS_UNLOCK_MASK |
+  DBUS_THREAD_FUNCTIONS_CONDVAR_NEW_MASK |
+  DBUS_THREAD_FUNCTIONS_CONDVAR_FREE_MASK |
+  DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_MASK |
+  DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_TIMEOUT_MASK |
+  DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ONE_MASK|
+  DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ALL_MASK,
   dbus_qmutex_new,
   dbus_qmutex_free,
   dbus_qmutex_lock,
   dbus_qmutex_unlock
+  dbus_qcondvar_new,
+  dbus_qcondvar_free,
+  dbus_qcondvar_wait,
+  dbus_qcondvar_wait_timeout,
+  dbus_qcondvar_wake_one,
+  dbus_qcondvar_wake_all
 };
 
 static DBusMutex *
@@ -75,6 +97,58 @@ dbus_qmutex_unlock (DBusMutex *mutex)
   return TRUE;
 }
 
+static DBusCondVar*
+dbus_qcondvar_new (void)
+{
+  QWaitCondition *cond;
+  cond = new QWaitCondition;
+  return static_cast<DBusCondVar*>( cond );
+}
+
+static void
+dbus_qcondvar_free (DBusCondVar *cond)
+{
+  QWaitCondition *cqond = static_cast<QMutex*>(mutex);
+  delete qcond;
+}
+
+static void
+dbus_qcondvar_wait (DBusCondVar *cond,
+		    DBusMutex   *mutex)
+{
+  QWaitCondition *qcond = static_cast<QWaitCondition*>(cond);
+  QMutex *qmutex = static_cast<QMutex*>(mutex);
+
+  qcond->wait (qmutex);
+}
+
+static dbus_bool_t
+dbus_gcondvar_wait_timeout (DBusCondVar *cond,
+			    DBusMutex   *mutex,
+			    int         timeout_msec)
+{
+  QWaitCondition *qcond = static_cast<QWaitCondition*>(cond);
+  QMutex *qmutex = static_cast<QMutex*>(mutex);
+
+  return qcond->wait (qmutex, timout_msec);
+}
+
+static void
+dbus_qcondvar_wake_one (DBusCondVar *cond)
+{
+  QWaitCondition *qcond = static_cast<QWaitCondition*>(cond);
+
+  qcond->wakeOne (qmutex);
+}
+
+static void
+dbus_qcondvar_wake_all (DBusCondVar *cond)
+{
+  QWaitCondition *qcond = static_cast<QWaitCondition*>(cond);
+
+  qcond->wakeAll (qmutex);
+}
+
 extern "C" {
 
 void
-- 
cgit