mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus: listen for disconnect signal

Browse source 
And log a warning when our connection is lost.

See #1099
This commit is contained in:
Wim Taymans 2021-05-17 10:17:33 +02:00
parent 3d2945c641
commit 40fbabd9ed
1 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
spa/plugins/support/dbus.c
View file

@ -32,6 +32,7 @@
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include <spa/utils/result.h>
#include <spa/utils/type.h> #include <spa/utils/type.h>
#include <spa/utils/names.h> #include <spa/utils/names.h>
#include <spa/support/log.h> #include <spa/support/log.h>
@ -271,6 +272,18 @@ static void wakeup_main(void *userdata)
spa_loop_utils_enable_idle(impl->utils, this->dispatch_event, true); spa_loop_utils_enable_idle(impl->utils, this->dispatch_event, true);
} }
static DBusHandlerResult filter_message (DBusConnection *connection,
DBusMessage *message, void *user_data)
{
struct connection *this = user_data;
struct impl *impl = this->impl;
if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, "Disconnected")) {
spa_log_warn(impl->log, "dbus connection %p disconnected", this);
}
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
static void * static void *
impl_connection_get(struct spa_dbus_connection *conn) impl_connection_get(struct spa_dbus_connection *conn)
{ {
@ -285,6 +298,8 @@ static void connection_free(struct connection *conn)
spa_list_remove(&conn->link); spa_list_remove(&conn->link);
dbus_connection_remove_filter(conn->conn, filter_message, conn);
dbus_connection_close(conn->conn); dbus_connection_close(conn->conn);
dbus_connection_unref(conn->conn); dbus_connection_unref(conn->conn);
@ -338,6 +353,9 @@ impl_get_connection(void *object,
spa_list_init(&conn->source_list); spa_list_init(&conn->source_list);
dbus_connection_set_exit_on_disconnect(conn->conn, false); dbus_connection_set_exit_on_disconnect(conn->conn, false);
if (!dbus_connection_add_filter(conn->conn, filter_message, conn, NULL))
goto error_filter;
dbus_connection_set_dispatch_status_function(conn->conn, dispatch_status, conn, NULL); dbus_connection_set_dispatch_status_function(conn->conn, dispatch_status, conn, NULL);
dbus_connection_set_watch_functions(conn->conn, add_watch, remove_watch, toggle_watch, conn, dbus_connection_set_watch_functions(conn->conn, add_watch, remove_watch, toggle_watch, conn,
NULL); NULL);
@ -351,20 +369,24 @@ impl_get_connection(void *object,
return &conn->this; return &conn->this;
error: error:
spa_log_error(impl->log, "Failed to connect to system bus: %s", error.message); spa_log_error(impl->log, "Failed to connect to system bus: %s", error.message);
dbus_error_free(&error); dbus_error_free(&error);
res = -ECONNREFUSED; res = -ECONNREFUSED;
goto out_free; goto out_free;
no_event: no_event:
res = -errno; res = -errno;
spa_log_error(impl->log, "Failed to create idle event: %m"); spa_log_error(impl->log, "Failed to create idle event: %m");
goto out_unref_dbus; goto out_unref_dbus;
error_filter:
res = -ENOMEM;
spa_log_error(impl->log, "Failed to create filter: %s", spa_strerror(res));
goto out_unref_dbus;
out_unref_dbus: out_unref_dbus:
dbus_connection_close(conn->conn); dbus_connection_close(conn->conn);
dbus_connection_unref(conn->conn); dbus_connection_unref(conn->conn);
out_free: out_free:
free(conn); free(conn);
errno = -res; errno = -res;
return NULL; return NULL;