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.

2 files changed, 86 insertions, 10 deletions

diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c
index 80d7d6ba..857ee37e 100644
--- a/glib/dbus-gmain.c
+++ b/glib/dbus-gmain.c
@@ -59,7 +59,7 @@ dbus_connection_prepare (GSource *source,
   
   *timeout = -1;
 
-  return (dbus_connection_peek_message (connection) != NULL);  
+  return (dbus_connection_get_n_messages (connection) > 0);  
 }
 
 static gboolean
diff --git a/glib/dbus-gthread.c b/glib/dbus-gthread.c
index 685f4cd6..8ed0a13a 100644
--- a/glib/dbus-gthread.c
+++ b/glib/dbus-gthread.c
@@ -25,21 +25,45 @@
 #include <dbus/dbus.h>
 #include "dbus-glib.h"
 
-static DBusMutex * dbus_gmutex_new    (void);
-static void        dbus_gmutex_free   (DBusMutex *mutex);
-static dbus_bool_t dbus_gmutex_lock   (DBusMutex *mutex);
-static dbus_bool_t dbus_gmutex_unlock (DBusMutex *mutex);
+static DBusMutex * dbus_gmutex_new        (void);
+static void        dbus_gmutex_free       (DBusMutex   *mutex);
+static dbus_bool_t dbus_gmutex_lock       (DBusMutex   *mutex);
+static dbus_bool_t dbus_gmutex_unlock     (DBusMutex   *mutex);
+
+
+static DBusCondVar* dbus_gcondvar_new          (void);
+static void         dbus_gcondvar_free         (DBusCondVar *cond);
+static void         dbus_gcondvar_wait         (DBusCondVar *cond,
+						DBusMutex   *mutex);
+static dbus_bool_t  dbus_gcondvar_wait_timeout (DBusCondVar *cond,
+						DBusMutex   *mutex,
+						int          timeout_msec);
+static void         dbus_gcondvar_wake_one     (DBusCondVar *cond);
+static void         dbus_gcondvar_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_MUTEX_NEW_MASK |
+  DBUS_THREAD_FUNCTIONS_MUTEX_FREE_MASK |
+  DBUS_THREAD_FUNCTIONS_MUTEX_LOCK_MASK |
+  DBUS_THREAD_FUNCTIONS_MUTEX_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_gmutex_new,
   dbus_gmutex_free,
   dbus_gmutex_lock,
-  dbus_gmutex_unlock
+  dbus_gmutex_unlock,
+  dbus_gcondvar_new,
+  dbus_gcondvar_free,
+  dbus_gcondvar_wait,
+  dbus_gcondvar_wait_timeout,
+  dbus_gcondvar_wake_one,
+  dbus_gcondvar_wake_all
 };
 
 static DBusMutex *
@@ -74,6 +98,58 @@ dbus_gmutex_unlock (DBusMutex *mutex)
   return TRUE;
 }
 
+static DBusCondVar*
+dbus_gcondvar_new (void)
+{
+  return (DBusCondVar*)g_cond_new ();
+}
+
+static void
+dbus_gcondvar_free (DBusCondVar *cond)
+{
+  g_cond_free ((GCond *)cond);
+}
+
+static void
+dbus_gcondvar_wait (DBusCondVar *cond,
+		    DBusMutex   *mutex)
+{
+  g_cond_wait ((GCond *)cond, (GMutex *)mutex);
+}
+
+static dbus_bool_t
+dbus_gcondvar_wait_timeout (DBusCondVar *cond,
+			    DBusMutex   *mutex,
+			    int         timeout_msec)
+{
+  GTimeVal now;
+  
+  g_get_current_time (&now);
+
+  now.tv_sec += timeout_msec / 1000;
+  now.tv_usec += (timeout_msec % 1000) * 1000;
+  if (now.tv_usec > G_USEC_PER_SEC)
+    {
+      now.tv_sec += 1;
+      now.tv_usec -= G_USEC_PER_SEC;
+    }
+  
+  return g_cond_timed_wait ((GCond *)cond, (GMutex *)mutex, &now);
+}
+
+static void
+dbus_gcondvar_wake_one (DBusCondVar *cond)
+{
+  g_cond_signal ((GCond *)cond);
+}
+
+static void
+dbus_gcondvar_wake_all (DBusCondVar *cond)
+{
+  g_cond_broadcast ((GCond *)cond);
+}
+
+
 void
 dbus_gthread_init (void)
 {