dbus/glib/dbus-gthread.c
Alexander Larsson fe40189411 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.
2003-02-15 16:25:08 +00:00

160 lines
3.9 KiB
C

/* -*- mode: C; c-file-style: "gnu" -*- */
/* dbus-gthread.c GThread integration
*
* Copyright (C) 2002 CodeFactory AB
*
* Licensed under the Academic Free License version 1.2
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#include <glib.h>
#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 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_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_gcondvar_new,
dbus_gcondvar_free,
dbus_gcondvar_wait,
dbus_gcondvar_wait_timeout,
dbus_gcondvar_wake_one,
dbus_gcondvar_wake_all
};
static DBusMutex *
dbus_gmutex_new (void)
{
GMutex *mutex;
mutex = g_mutex_new ();
return (DBusMutex *)mutex;
}
static void
dbus_gmutex_free (DBusMutex *mutex)
{
g_mutex_free ((GMutex *)mutex);
}
static dbus_bool_t
dbus_gmutex_lock (DBusMutex *mutex)
{
g_mutex_lock ((GMutex *)mutex);
return TRUE;
}
static dbus_bool_t
dbus_gmutex_unlock (DBusMutex *mutex)
{
g_mutex_unlock ((GMutex *)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)
{
if (!g_thread_supported ())
g_error ("g_thread_init() must be called before dbus_threads_init()");
dbus_threads_init (&functions);
}