Attachment 936439 Details for Bug 1140527 – initial upstream patch 2

[patch] initial upstream patch 2

0006-DBusConnection-implements-_dbus_connection_get_pendi.patch (text/plain), 4.76 KB, created by Murray McAllister on 2014-09-11 08:37:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Murray McAllister

Created: 2014-09-11 08:37:59 UTC

Size: 4.76 KB

patch

obsolete

>From 772fc86c5970cb7a7789ca516e47c599235c5b07 Mon Sep 17 00:00:00 2001
>From: Alban Crequy <alban.crequy@collabora.co.uk>
>Date: Fri, 18 Jul 2014 16:45:07 +0100
>Subject: [PATCH 06/11] DBusConnection: implements
> _dbus_connection_get_pending_fds_count
>
>This will allow the bus to know whether there are pending file descriptors in a
>DBusConnection's DBusMessageLoader.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=80559
>Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> dbus/dbus-connection-internal.h |  1 +
> dbus/dbus-connection.c          | 11 +++++++++++
> dbus/dbus-message-internal.h    |  1 +
> dbus/dbus-message.c             | 11 +++++++++++
> dbus/dbus-transport.c           | 11 +++++++++++
> dbus/dbus-transport.h           |  1 +
> 6 files changed, 36 insertions(+)
>
>diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h
>index 2842f2f..24e4772 100644
>--- a/dbus/dbus-connection-internal.h
>+++ b/dbus/dbus-connection-internal.h
>@@ -100,6 +100,7 @@ void              _dbus_connection_test_get_locks                 (DBusConnectio
>                                                                    DBusMutex **io_path_mutex_loc,
>                                                                    DBusCondVar **dispatch_cond_loc,
>                                                                    DBusCondVar **io_path_cond_loc);
>+int               _dbus_connection_get_pending_fds_count          (DBusConnection *connection);
> 
> /* if DBUS_ENABLE_STATS */
> void _dbus_connection_get_stats (DBusConnection *connection,
>diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
>index f0b6871..6aa24bc 100644
>--- a/dbus/dbus-connection.c
>+++ b/dbus/dbus-connection.c
>@@ -2549,6 +2549,17 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending)
>   dbus_pending_call_unref (pending);
> }
> 
>+/**
>+ * Return how many file descriptors are pending in the loader
>+ *
>+ * @param connection the connection
>+ */
>+int
>+_dbus_connection_get_pending_fds_count (DBusConnection *connection)
>+{
>+  return _dbus_transport_get_pending_fds_count (connection->transport);
>+}
>+
> /** @} */
> 
> /**
>diff --git a/dbus/dbus-message-internal.h b/dbus/dbus-message-internal.h
>index 5d6594e..45cb026 100644
>--- a/dbus/dbus-message-internal.h
>+++ b/dbus/dbus-message-internal.h
>@@ -96,6 +96,7 @@ long               _dbus_message_loader_get_max_message_size  (DBusMessageLoader
> void               _dbus_message_loader_set_max_message_unix_fds(DBusMessageLoader  *loader,
>                                                                  long                n);
> long               _dbus_message_loader_get_max_message_unix_fds(DBusMessageLoader  *loader);
>+int                _dbus_message_loader_get_pending_fds_count (DBusMessageLoader  *loader);
> 
> typedef struct DBusInitialFDs DBusInitialFDs;
> DBusInitialFDs *_dbus_check_fdleaks_enter (void);
>diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
>index 78df755..03c6be9 100644
>--- a/dbus/dbus-message.c
>+++ b/dbus/dbus-message.c
>@@ -4498,6 +4498,17 @@ _dbus_message_loader_get_max_message_unix_fds (DBusMessageLoader  *loader)
>   return loader->max_message_unix_fds;
> }
> 
>+/**
>+ * Return how many file descriptors are pending in the loader
>+ *
>+ * @param loader the loader
>+ */
>+int
>+_dbus_message_loader_get_pending_fds_count (DBusMessageLoader *loader)
>+{
>+  return loader->n_unix_fds;
>+}
>+
> static DBusDataSlotAllocator slot_allocator =
>   _DBUS_DATA_SLOT_ALLOCATOR_INIT (_DBUS_LOCK_NAME (message_slots));
> 
>diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
>index ecc3182..690e5ba 100644
>--- a/dbus/dbus-transport.c
>+++ b/dbus/dbus-transport.c
>@@ -1512,6 +1512,17 @@ _dbus_transport_set_allow_anonymous (DBusTransport              *transport,
>   transport->allow_anonymous = value != FALSE;
> }
> 
>+/**
>+ * Return how many file descriptors are pending in the loader
>+ *
>+ * @param transport the transport
>+ */
>+int
>+_dbus_transport_get_pending_fds_count (DBusTransport *transport)
>+{
>+  return _dbus_message_loader_get_pending_fds_count (transport->loader);
>+}
>+
> #ifdef DBUS_ENABLE_STATS
> void
> _dbus_transport_get_stats (DBusTransport  *transport,
>diff --git a/dbus/dbus-transport.h b/dbus/dbus-transport.h
>index 80fa24e..ff102f3 100644
>--- a/dbus/dbus-transport.h
>+++ b/dbus/dbus-transport.h
>@@ -97,6 +97,7 @@ dbus_bool_t        _dbus_transport_set_auth_mechanisms    (DBusTransport
>                                                            const char                **mechanisms);
> void               _dbus_transport_set_allow_anonymous    (DBusTransport              *transport,
>                                                            dbus_bool_t                 value);
>+int                _dbus_transport_get_pending_fds_count  (DBusTransport              *transport);
> 
> /* if DBUS_ENABLE_STATS */
> void _dbus_transport_get_stats (DBusTransport  *transport,
>-- 
>2.1.0
>

Actions: View | Diff

Attachments on bug 1140527: 936438 | 936439 | 936441 | 936442