fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 20:27:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2003-02-20 Alexander Larsson <alexl@redhat.com>

Browse source 
* dbus/dbus-transport-unix.c (unix_do_iteration):
	Unlock the connection mutex during a blocking select call.
	Add todo about how we need a way to wake up the select.

	* dbus/dbus-connection-internal.h:
	* dbus/dbus-connection.c:
	Add _dbus_connection_lock and _dbus_connection_unlock.
This commit is contained in:
Alexander Larsson 2003-02-20 10:00:48 +00:00
parent 6b40feaff4
commit 5da911bce0
4 changed files with 62 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2003-02-20 Alexander Larsson <alexl@redhat.com>
* dbus/dbus-transport-unix.c (unix_do_iteration):
Unlock the connection mutex during a blocking select call.
Add todo about how we need a way to wake up the select.
* dbus/dbus-connection-internal.h:
* dbus/dbus-connection.c:
Add _dbus_connection_lock and _dbus_connection_unlock.
2003-02-19 Havoc Pennington <hp@pobox.com>
* Doxyfile.in (PREDEFINED): put DOXYGEN_SHOULD_SKIP_THIS in

3
dbus/dbus-connection-internal.h
View file

@ -38,6 +38,9 @@ typedef enum
DBUS_ITERATION_BLOCK = 1 << 2 /**< Block if nothing to do. */
} DBusIterationFlags;
void _dbus_connection_lock (DBusConnection *connection);
void _dbus_connection_unlock (DBusConnection *connection);
void _dbus_connection_ref_unlocked (DBusConnection *connection);
dbus_bool_t _dbus_connection_queue_received_message (DBusConnection *connection,

27
dbus/dbus-connection.c
View file

@ -134,6 +134,27 @@ static void _dbus_connection_free_data_slots_nolock (DBusConnection *connection)
static void _dbus_connection_remove_timeout_locked (DBusConnection *connection,
DBusTimeout *timeout);
/**
* Acquires the connection lock.
*
* @param connection the connection.
*/
void
_dbus_connection_lock (DBusConnection *connection)
{
dbus_mutex_lock (connection->mutex);
}
/**
* Releases the connection lock.
*
* @param connection the connection.
*/
void
_dbus_connection_unlock (DBusConnection *connection)
{
dbus_mutex_unlock (connection->mutex);
}
/**
@ -336,9 +357,9 @@ static void
_dbus_connection_remove_timeout_locked (DBusConnection *connection,
DBusTimeout *timeout)
{
dbus_mutex_lock (connection->mutex);
_dbus_connection_remove_timeout (connection, timeout);
dbus_mutex_unlock (connection->mutex);
dbus_mutex_lock (connection->mutex);
_dbus_connection_remove_timeout (connection, timeout);
dbus_mutex_unlock (connection->mutex);
}

27
dbus/dbus-transport-unix.c
View file

@ -884,6 +884,13 @@ unix_messages_pending (DBusTransport *transport,
}
/* FIXME use _dbus_poll(), not select() */
/**
* @todo We need to have a way to wake up the select sleep if
* a new iteration request comes in with a flag (read/write) that
* we're not currently serving. Otherwise a call that just reads
* could block a write call forever (if there are no incoming
* messages).
*/
static void
unix_do_iteration (DBusTransport *transport,
unsigned int flags,
@ -893,6 +900,7 @@ unix_do_iteration (DBusTransport *transport,
fd_set read_set;
fd_set write_set;
dbus_bool_t do_select;
int select_res;
_dbus_verbose (" iteration flags = %s%s timeout = %d\n",
flags & DBUS_ITERATION_DO_READING ? "read" : "",
@ -984,9 +992,24 @@ unix_do_iteration (DBusTransport *transport,
timeout.tv_usec = 0;
use_timeout = TRUE;
}
/* For blocking selects we drop the connection lock here
* to avoid blocking out connection access during a potentially
* indefinite blocking call. The io path is still protected
* by the io_path_cond condvar, so we won't reenter this.
*/
if (flags & DBUS_ITERATION_BLOCK)
_dbus_connection_unlock (transport->connection);
if (select (unix_transport->fd + 1, &read_set, &write_set, &err_set,
use_timeout ? &timeout : NULL) >= 0)
select_res = select (unix_transport->fd + 1,
&read_set, &write_set, &err_set,
use_timeout ? &timeout : NULL);
if (flags & DBUS_ITERATION_BLOCK)
_dbus_connection_lock (transport->connection);
if (select_res >= 0)
{
if (FD_ISSET (unix_transport->fd, &err_set))
do_io_error (transport);