Commit 1763e02b authored by Simon McVittie's avatar Simon McVittie

Fix compilation for removal of link cache

parent 7953ca2f
......@@ -263,7 +263,6 @@ bus_stats_handle_get_connection_stats (DBusConnection *caller_connection,
static dbus_uint32_t stats_serial = 0;
dbus_uint32_t in_messages, in_bytes, in_fds, in_peak_bytes, in_peak_fds;
dbus_uint32_t out_messages, out_bytes, out_fds, out_peak_bytes, out_peak_fds;
dbus_uint32_t link_cache_bytes;
BusRegistry *registry;
BusService *service;
DBusConnection *stats_connection;
......@@ -316,8 +315,7 @@ bus_stats_handle_get_connection_stats (DBusConnection *caller_connection,
&in_messages, &in_bytes, &in_fds,
&in_peak_bytes, &in_peak_fds,
&out_messages, &out_bytes, &out_fds,
&out_peak_bytes, &out_peak_fds,
&link_cache_bytes);
&out_peak_bytes, &out_peak_fds);
if (!asv_add_uint32 (&iter, &arr_iter, "IncomingMessages", in_messages) ||
!asv_add_uint32 (&iter, &arr_iter, "IncomingBytes", in_bytes) ||
......@@ -328,8 +326,7 @@ bus_stats_handle_get_connection_stats (DBusConnection *caller_connection,
!asv_add_uint32 (&iter, &arr_iter, "OutgoingBytes", out_bytes) ||
!asv_add_uint32 (&iter, &arr_iter, "OutgoingFDs", out_fds) ||
!asv_add_uint32 (&iter, &arr_iter, "PeakOutgoingBytes", out_peak_bytes) ||
!asv_add_uint32 (&iter, &arr_iter, "PeakOutgoingFDs", out_peak_fds) ||
!asv_add_uint32 (&iter, &arr_iter, "LinkCacheBytes", link_cache_bytes))
!asv_add_uint32 (&iter, &arr_iter, "PeakOutgoingFDs", out_peak_fds))
goto oom;
/* end */
......
......@@ -114,8 +114,7 @@ void _dbus_connection_get_stats (DBusConnection *connection,
dbus_uint32_t *out_bytes,
dbus_uint32_t *out_fds,
dbus_uint32_t *out_peak_bytes,
dbus_uint32_t *out_peak_fds,
dbus_uint32_t *link_cache_size);
dbus_uint32_t *out_peak_fds);
/* This _dbus_bus_* stuff doesn't really belong here, but dbus-bus-internal.h seems
* silly for one function
......
......@@ -6180,8 +6180,7 @@ _dbus_connection_get_stats (DBusConnection *connection,
dbus_uint32_t *out_bytes,
dbus_uint32_t *out_fds,
dbus_uint32_t *out_peak_bytes,
dbus_uint32_t *out_peak_fds,
dbus_uint32_t *link_cache_size)
dbus_uint32_t *out_peak_fds)
{
CONNECTION_LOCK (connection);
......@@ -6206,11 +6205,6 @@ _dbus_connection_get_stats (DBusConnection *connection,
if (out_peak_fds != NULL)
*out_peak_fds = _dbus_counter_get_peak_unix_fd_value (connection->outgoing_counter);
if (link_cache_size != NULL)
{
*link_cache_size = _dbus_list_get_length (&connection->link_cache) * sizeof (DBusList);
}
CONNECTION_UNLOCK (connection);
}
#endif /* DBUS_ENABLE_STATS */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment