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.

1 files changed, 44 insertions, 23 deletions

diff --git a/dbus/dbus-threads.h b/dbus/dbus-threads.h
index ddc270bb..0dcb1040 100644
--- a/dbus/dbus-threads.h
+++ b/dbus/dbus-threads.h
@@ -33,20 +33,37 @@
 DBUS_BEGIN_DECLS;
 
 typedef struct DBusMutex DBusMutex;
+typedef struct DBusCondVar DBusCondVar;
 
 typedef DBusMutex*  (* DBusMutexNewFunction)    (void);
 typedef void        (* DBusMutexFreeFunction)   (DBusMutex *mutex);
 typedef dbus_bool_t (* DBusMutexLockFunction)   (DBusMutex *mutex);
 typedef dbus_bool_t (* DBusMutexUnlockFunction) (DBusMutex *mutex);
 
+typedef DBusCondVar*  (* DBusCondVarNewFunction)         (void);
+typedef void          (* DBusCondVarFreeFunction)        (DBusCondVar *cond);
+typedef void          (* DBusCondVarWaitFunction)        (DBusCondVar *cond,
+							  DBusMutex   *mutex);
+typedef dbus_bool_t   (* DBusCondVarWaitTimeoutFunction) (DBusCondVar *cond,
+							  DBusMutex   *mutex,
+							  int          timeout_milliseconds);
+typedef void          (* DBusCondVarWakeOneFunction) (DBusCondVar *cond);
+typedef void          (* DBusCondVarWakeAllFunction) (DBusCondVar *cond);
+
 typedef enum 
 {
-  DBUS_THREAD_FUNCTIONS_NEW_MASK     = 1 << 0,
-  DBUS_THREAD_FUNCTIONS_FREE_MASK    = 1 << 1,
-  DBUS_THREAD_FUNCTIONS_LOCK_MASK    = 1 << 2,
-  DBUS_THREAD_FUNCTIONS_UNLOCK_MASK  = 1 << 3,
-
-  DBUS_THREAD_FUNCTIONS_ALL_MASK     = 0xf
+  DBUS_THREAD_FUNCTIONS_MUTEX_NEW_MASK      = 1 << 0,
+  DBUS_THREAD_FUNCTIONS_MUTEX_FREE_MASK     = 1 << 1,
+  DBUS_THREAD_FUNCTIONS_MUTEX_LOCK_MASK     = 1 << 2,
+  DBUS_THREAD_FUNCTIONS_MUTEX_UNLOCK_MASK   = 1 << 3,
+  DBUS_THREAD_FUNCTIONS_CONDVAR_NEW_MASK    = 1 << 4,
+  DBUS_THREAD_FUNCTIONS_CONDVAR_FREE_MASK   = 1 << 5,
+  DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_MASK   = 1 << 6,
+  DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_TIMEOUT_MASK   = 1 << 7,
+  DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ONE_MASK = 1 << 8,
+  DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ALL_MASK = 1 << 9,
+
+  DBUS_THREAD_FUNCTIONS_ALL_MASK     = (1 << 10) - 1
 } DBusThreadFunctionsMask;
 
 typedef struct
@@ -58,6 +75,13 @@ typedef struct
   DBusMutexLockFunction mutex_lock;
   DBusMutexUnlockFunction mutex_unlock;
 
+  DBusCondVarNewFunction condvar_new;
+  DBusCondVarFreeFunction condvar_free;
+  DBusCondVarWaitFunction condvar_wait;
+  DBusCondVarWaitTimeoutFunction condvar_wait_timeout;
+  DBusCondVarWakeOneFunction condvar_wake_one;
+  DBusCondVarWakeAllFunction condvar_wake_all;
+  
   void (* padding1) (void);
   void (* padding2) (void);
   void (* padding3) (void);
@@ -70,27 +94,24 @@ typedef struct
 } DBusThreadFunctions;
 
 
-DBusMutex*  dbus_mutex_new    (void);
-void        dbus_mutex_free   (DBusMutex *mutex);
-dbus_bool_t dbus_mutex_lock   (DBusMutex *mutex);
-dbus_bool_t dbus_mutex_unlock (DBusMutex *mutex);
+DBusMutex*   dbus_mutex_new            (void);
+void         dbus_mutex_free           (DBusMutex                 *mutex);
+dbus_bool_t  dbus_mutex_lock           (DBusMutex                 *mutex);
+dbus_bool_t  dbus_mutex_unlock         (DBusMutex                 *mutex);
 
-dbus_bool_t dbus_threads_init (const DBusThreadFunctions *functions);
+DBusCondVar* dbus_condvar_new          (void);
+void         dbus_condvar_free         (DBusCondVar               *cond);
+void         dbus_condvar_wait         (DBusCondVar               *cond,
+					DBusMutex                 *mutex);
+dbus_bool_t  dbus_condvar_wait_timeout (DBusCondVar               *cond,
+					DBusMutex                 *mutex,
+					int                        timeout_milliseconds);
+void         dbus_condvar_wake_one     (DBusCondVar               *cond);
+void         dbus_condvar_wake_all     (DBusCondVar               *cond);
 
-typedef struct DBusStaticMutex DBusStaticMutex;
-
-struct DBusStaticMutex
-{
-  void *pad1;
-  void *pad2;
-  void *pad3;
-  void *pad4;
-};
+dbus_bool_t  dbus_threads_init         (const DBusThreadFunctions *functions);
 
-#define DBUS_STATIC_MUTEX_INIT { NULL, NULL, NULL, NULL }
 
-dbus_bool_t dbus_static_mutex_lock   (DBusStaticMutex *mutex);
-dbus_bool_t dbus_static_mutex_unlock (DBusStaticMutex *mutex);
 
 DBUS_END_DECLS;