diff options
| author | Johannes Carlsson <johannes.carlsson.x@sonyericsson.com> | 2010-06-09 11:58:06 +0200 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2010-06-09 12:28:15 +0200 |
| commit | 81656e679be3d1c51fee935d52fbc6e8748fdbef (patch) | |
| tree | ecbd14f92099ac3488064c85e87ec8bf56dfab07 /dbus/dbus-connection-internal.h | |
| parent | cd815c347a279f324e5025fcda71a16ad9b08c7d (diff) | |
| download | dbus-81656e679be3d1c51fee935d52fbc6e8748fdbef.tar.gz | |
Corrected thread problem causing some calls to hang for 25s
Since the connection lock is released for a short while in
_dbus_connection_acquire_io_path there can already be a method return
received by another thread. The fix is to do an extra check after the
I/O path has been aquired both.
Approved-by: Thiago Macieira
Diffstat (limited to 'dbus/dbus-connection-internal.h')
| -rw-r--r-- | dbus/dbus-connection-internal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h index 721b5d73..cdf3f59d 100644 --- a/dbus/dbus-connection-internal.h +++ b/dbus/dbus-connection-internal.h @@ -75,6 +75,7 @@ void _dbus_connection_toggle_timeout_unlocked (DBusConnection dbus_bool_t enabled); DBusConnection* _dbus_connection_new_for_transport (DBusTransport *transport); void _dbus_connection_do_iteration_unlocked (DBusConnection *connection, + DBusPendingCall *pending, unsigned int flags, int timeout_milliseconds); void _dbus_connection_close_possibly_shared (DBusConnection *connection); |