2002-12-16 Anders Carlsson <andersca@codefactory.se>
* Makefile.am:
* configure.in:
Add GLib checks and fixup .pc files
* glib/Makefile.am:
* glib/dbus-glib.h:
* glib/dbus-gmain.c: (gdbus_connection_prepare),
(gdbus_connection_check), (gdbus_connection_dispatch),
(gdbus_add_connection_watch), (gdbus_remove_connection_watch),
(dbus_connection_gsource_new):
* glib/dbus-gthread.c: (dbus_gmutex_new), (dbus_gmutex_free),
(dbus_gmutex_lock), (dbus_gmutex_unlock), (dbus_gthread_init):
* glib/test-dbus-glib.c: (message_handler), (main):
Add GLib support.
2002-12-16 00:26:05 +00:00
|
|
|
/* -*- mode: C; c-file-style: "gnu" -*- */
|
2002-12-16 00:56:23 +00:00
|
|
|
/* dbus-gthread.c GThread integration
|
2002-12-16 Anders Carlsson <andersca@codefactory.se>
* Makefile.am:
* configure.in:
Add GLib checks and fixup .pc files
* glib/Makefile.am:
* glib/dbus-glib.h:
* glib/dbus-gmain.c: (gdbus_connection_prepare),
(gdbus_connection_check), (gdbus_connection_dispatch),
(gdbus_add_connection_watch), (gdbus_remove_connection_watch),
(dbus_connection_gsource_new):
* glib/dbus-gthread.c: (dbus_gmutex_new), (dbus_gmutex_free),
(dbus_gmutex_lock), (dbus_gmutex_unlock), (dbus_gthread_init):
* glib/test-dbus-glib.c: (message_handler), (main):
Add GLib support.
2002-12-16 00:26:05 +00:00
|
|
|
*
|
|
|
|
|
* 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>
|
2002-12-24 06:37:33 +00:00
|
|
|
#include "dbus-glib.h"
|
2002-12-16 Anders Carlsson <andersca@codefactory.se>
* Makefile.am:
* configure.in:
Add GLib checks and fixup .pc files
* glib/Makefile.am:
* glib/dbus-glib.h:
* glib/dbus-gmain.c: (gdbus_connection_prepare),
(gdbus_connection_check), (gdbus_connection_dispatch),
(gdbus_add_connection_watch), (gdbus_remove_connection_watch),
(dbus_connection_gsource_new):
* glib/dbus-gthread.c: (dbus_gmutex_new), (dbus_gmutex_free),
(dbus_gmutex_lock), (dbus_gmutex_unlock), (dbus_gthread_init):
* glib/test-dbus-glib.c: (message_handler), (main):
Add GLib support.
2002-12-16 00:26:05 +00:00
|
|
|
|
2003-02-15 16:25:08 +00:00
|
|
|
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);
|
|
|
|
|
|
2002-12-16 Anders Carlsson <andersca@codefactory.se>
* Makefile.am:
* configure.in:
Add GLib checks and fixup .pc files
* glib/Makefile.am:
* glib/dbus-glib.h:
* glib/dbus-gmain.c: (gdbus_connection_prepare),
(gdbus_connection_check), (gdbus_connection_dispatch),
(gdbus_add_connection_watch), (gdbus_remove_connection_watch),
(dbus_connection_gsource_new):
* glib/dbus-gthread.c: (dbus_gmutex_new), (dbus_gmutex_free),
(dbus_gmutex_lock), (dbus_gmutex_unlock), (dbus_gthread_init):
* glib/test-dbus-glib.c: (message_handler), (main):
Add GLib support.
2002-12-16 00:26:05 +00:00
|
|
|
|
|
|
|
|
static const DBusThreadFunctions functions =
|
|
|
|
|
{
|
2003-02-15 16:25:08 +00:00
|
|
|
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,
|
2002-12-16 Anders Carlsson <andersca@codefactory.se>
* Makefile.am:
* configure.in:
Add GLib checks and fixup .pc files
* glib/Makefile.am:
* glib/dbus-glib.h:
* glib/dbus-gmain.c: (gdbus_connection_prepare),
(gdbus_connection_check), (gdbus_connection_dispatch),
(gdbus_add_connection_watch), (gdbus_remove_connection_watch),
(dbus_connection_gsource_new):
* glib/dbus-gthread.c: (dbus_gmutex_new), (dbus_gmutex_free),
(dbus_gmutex_lock), (dbus_gmutex_unlock), (dbus_gthread_init):
* glib/test-dbus-glib.c: (message_handler), (main):
Add GLib support.
2002-12-16 00:26:05 +00:00
|
|
|
dbus_gmutex_new,
|
|
|
|
|
dbus_gmutex_free,
|
|
|
|
|
dbus_gmutex_lock,
|
2003-02-15 16:25:08 +00:00
|
|
|
dbus_gmutex_unlock,
|
|
|
|
|
dbus_gcondvar_new,
|
|
|
|
|
dbus_gcondvar_free,
|
|
|
|
|
dbus_gcondvar_wait,
|
|
|
|
|
dbus_gcondvar_wait_timeout,
|
|
|
|
|
dbus_gcondvar_wake_one,
|
|
|
|
|
dbus_gcondvar_wake_all
|
2002-12-16 Anders Carlsson <andersca@codefactory.se>
* Makefile.am:
* configure.in:
Add GLib checks and fixup .pc files
* glib/Makefile.am:
* glib/dbus-glib.h:
* glib/dbus-gmain.c: (gdbus_connection_prepare),
(gdbus_connection_check), (gdbus_connection_dispatch),
(gdbus_add_connection_watch), (gdbus_remove_connection_watch),
(dbus_connection_gsource_new):
* glib/dbus-gthread.c: (dbus_gmutex_new), (dbus_gmutex_free),
(dbus_gmutex_lock), (dbus_gmutex_unlock), (dbus_gthread_init):
* glib/test-dbus-glib.c: (message_handler), (main):
Add GLib support.
2002-12-16 00:26:05 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2003-02-15 16:25:08 +00:00
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2002-12-16 Anders Carlsson <andersca@codefactory.se>
* Makefile.am:
* configure.in:
Add GLib checks and fixup .pc files
* glib/Makefile.am:
* glib/dbus-glib.h:
* glib/dbus-gmain.c: (gdbus_connection_prepare),
(gdbus_connection_check), (gdbus_connection_dispatch),
(gdbus_add_connection_watch), (gdbus_remove_connection_watch),
(dbus_connection_gsource_new):
* glib/dbus-gthread.c: (dbus_gmutex_new), (dbus_gmutex_free),
(dbus_gmutex_lock), (dbus_gmutex_unlock), (dbus_gthread_init):
* glib/test-dbus-glib.c: (message_handler), (main):
Add GLib support.
2002-12-16 00:26:05 +00:00
|
|
|
void
|
|
|
|
|
dbus_gthread_init (void)
|
|
|
|
|
{
|
|
|
|
|
if (!g_thread_supported ())
|
2002-12-16 00:56:23 +00:00
|
|
|
g_error ("g_thread_init() must be called before dbus_threads_init()");
|
2002-12-16 Anders Carlsson <andersca@codefactory.se>
* Makefile.am:
* configure.in:
Add GLib checks and fixup .pc files
* glib/Makefile.am:
* glib/dbus-glib.h:
* glib/dbus-gmain.c: (gdbus_connection_prepare),
(gdbus_connection_check), (gdbus_connection_dispatch),
(gdbus_add_connection_watch), (gdbus_remove_connection_watch),
(dbus_connection_gsource_new):
* glib/dbus-gthread.c: (dbus_gmutex_new), (dbus_gmutex_free),
(dbus_gmutex_lock), (dbus_gmutex_unlock), (dbus_gthread_init):
* glib/test-dbus-glib.c: (message_handler), (main):
Add GLib support.
2002-12-16 00:26:05 +00:00
|
|
|
|
|
|
|
|
dbus_threads_init (&functions);
|
|
|
|
|
}
|