mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

modules: handle factory destroy

Browse source 
Listen for factory destroy and clean up the module.

See #565
This commit is contained in:
Wim Taymans 2022-05-06 12:11:20 +02:00
parent 95f8c569a0
commit 383df85466
12 changed files with 264 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/modules/module-session-manager/client-endpoint/client-endpoint.c
View file

@ -38,9 +38,11 @@
#define NAME "client-endpoint"
struct factory_data {
struct pw_impl_factory *factory;
struct pw_impl_module *module;
struct spa_hook module_listener;
struct pw_impl_factory *factory;
struct spa_hook factory_listener;
};
static struct endpoint_stream *find_stream(struct client_endpoint *this, uint32_t id)
@ -219,12 +221,27 @@ static const struct pw_impl_factory_implementation impl_factory = {
.create_object = create_object,
};
static void factory_destroy(void *data)
{
struct factory_data *d = data;
spa_hook_remove(&d->factory_listener);
d->factory = NULL;
if (d->module)
pw_impl_module_destroy(d->module);
}
static const struct pw_impl_factory_events factory_events = {
PW_VERSION_IMPL_FACTORY_EVENTS,
.destroy = factory_destroy,
};
static void module_destroy(void *data)
{
struct factory_data *d = data;
spa_hook_remove(&d->module_listener);
pw_impl_factory_destroy(d->factory);
d->module = NULL;
if (d->factory)
pw_impl_factory_destroy(d->factory);
}
static void module_registered(void *data)
@ -271,6 +288,7 @@ int client_endpoint_factory_init(struct pw_impl_module *module)
data->module = module;
pw_impl_factory_set_implementation(factory, &impl_factory, data);
pw_impl_factory_add_listener(factory, &data->factory_listener, &factory_events, data);
pw_impl_module_add_listener(module, &data->module_listener, &module_events, data);

24
src/modules/module-session-manager/client-session/client-session.c
View file

@ -38,9 +38,11 @@
#define NAME "client-session"
struct factory_data {
struct pw_impl_factory *factory;
struct pw_impl_module *module;
struct spa_hook module_listener;
struct pw_impl_factory *factory;
struct spa_hook factory_listener;
};
static struct endpoint_link *find_link(struct client_session *this, uint32_t id)
@ -218,12 +220,27 @@ static const struct pw_impl_factory_implementation impl_factory = {
.create_object = create_object,
};
static void factory_destroy(void *data)
{
struct factory_data *d = data;
spa_hook_remove(&d->factory_listener);
d->factory = NULL;
if (d->module)
pw_impl_module_destroy(d->module);
}
static const struct pw_impl_factory_events factory_events = {
PW_VERSION_IMPL_FACTORY_EVENTS,
.destroy = factory_destroy,
};
static void module_destroy(void *data)
{
struct factory_data *d = data;
spa_hook_remove(&d->module_listener);
pw_impl_factory_destroy(d->factory);
d->module = NULL;
if (d->factory)
pw_impl_factory_destroy(d->factory);
}
static void module_registered(void *data)
@ -270,6 +287,7 @@ int client_session_factory_init(struct pw_impl_module *module)
data->module = module;
pw_impl_factory_set_implementation(factory, &impl_factory, data);
pw_impl_factory_add_listener(factory, &data->factory_listener, &factory_events, data);
pw_impl_module_add_listener(module, &data->module_listener, &module_events, data);

31
src/modules/module-session-manager/endpoint-link.c
View file

@ -78,7 +78,8 @@ struct resource_data
struct factory_data
{
struct pw_impl_factory *this;
struct pw_impl_factory *factory;
struct spa_hook factory_listener;
struct pw_impl_module *module;
struct spa_hook module_listener;
@ -472,7 +473,7 @@ static void *create_object(void *data,
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_impl_client_get_info(client)->id);
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_impl_factory_get_info(d->this)->id);
pw_impl_factory_get_info(d->factory)->id);
result = link_new(pw_impl_client_get_context(client), impl_resource, properties);
if (result == NULL) {
@ -502,20 +503,37 @@ static const struct pw_impl_factory_implementation impl_factory = {
.create_object = create_object,
};
static void factory_destroy(void *data)
{
struct factory_data *d = data;
spa_hook_remove(&d->factory_listener);
d->factory = NULL;
if (d->module)
pw_impl_module_destroy(d->module);
}
static const struct pw_impl_factory_events factory_events = {
PW_VERSION_IMPL_FACTORY_EVENTS,
.destroy = factory_destroy,
};
static void module_destroy(void *data)
{
struct factory_data *d = data;
spa_hook_remove(&d->module_listener);
spa_list_remove(&d->export.link);
pw_impl_factory_destroy(d->this);
d->module = NULL;
if (d->factory)
pw_impl_factory_destroy(d->factory);
}
static void module_registered(void *data)
{
struct factory_data *d = data;
struct pw_impl_module *module = d->module;
struct pw_impl_factory *factory = d->this;
struct pw_impl_factory *factory = d->factory;
struct spa_dict_item items[1];
char id[16];
int res;
@ -552,7 +570,7 @@ int endpoint_link_factory_init(struct pw_impl_module *module)
return -errno;
data = pw_impl_factory_get_user_data(factory);
data->this = factory;
data->factory = factory;
data->module = module;
pw_impl_factory_set_implementation(factory, &impl_factory, data);
@ -562,10 +580,11 @@ int endpoint_link_factory_init(struct pw_impl_module *module)
if ((res = pw_context_register_export_type(context, &data->export)) < 0)
goto error;
pw_impl_factory_add_listener(factory, &data->factory_listener, &factory_events, data);
pw_impl_module_add_listener(module, &data->module_listener, &module_events, data);
return 0;
error:
pw_impl_factory_destroy(data->this);
pw_impl_factory_destroy(data->factory);
return res;
}

33
src/modules/module-session-manager/endpoint-stream.c
View file

@ -78,11 +78,12 @@ struct resource_data
struct factory_data
{
struct pw_impl_factory *this;
struct pw_impl_module *module;
struct spa_hook module_listener;
struct pw_impl_factory *factory;
struct spa_hook factory_listener;
struct pw_export_type export;
};
@ -463,7 +464,7 @@ static void *create_object(void *data,
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_impl_client_get_info(client)->id);
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_impl_factory_get_info(d->this)->id);
pw_impl_factory_get_info(d->factory)->id);
result = stream_new(pw_impl_client_get_context(client), impl_resource, properties);
if (result == NULL) {
@ -493,20 +494,37 @@ static const struct pw_impl_factory_implementation impl_factory = {
.create_object = create_object,
};
static void factory_destroy(void *data)
{
struct factory_data *d = data;
spa_hook_remove(&d->factory_listener);
d->factory = NULL;
if (d->module)
pw_impl_module_destroy(d->module);
}
static const struct pw_impl_factory_events factory_events = {
PW_VERSION_IMPL_FACTORY_EVENTS,
.destroy = factory_destroy,
};
static void module_destroy(void *data)
{
struct factory_data *d = data;
spa_hook_remove(&d->module_listener);
spa_list_remove(&d->export.link);
pw_impl_factory_destroy(d->this);
d->module = NULL;
if (d->factory)
pw_impl_factory_destroy(d->factory);
}
static void module_registered(void *data)
{
struct factory_data *d = data;
struct pw_impl_module *module = d->module;
struct pw_impl_factory *factory = d->this;
struct pw_impl_factory *factory = d->factory;
struct spa_dict_item items[1];
char id[16];
int res;
@ -543,7 +561,7 @@ int endpoint_stream_factory_init(struct pw_impl_module *module)
return -errno;
data = pw_impl_factory_get_user_data(factory);
data->this = factory;
data->factory = factory;
data->module = module;
pw_impl_factory_set_implementation(factory, &impl_factory, data);
@ -553,10 +571,11 @@ int endpoint_stream_factory_init(struct pw_impl_module *module)
if ((res = pw_context_register_export_type(context, &data->export)) < 0)
goto error;
pw_impl_factory_add_listener(factory, &data->factory_listener, &factory_events, data);
pw_impl_module_add_listener(module, &data->module_listener, &module_events, data);
return 0;
error:
pw_impl_factory_destroy(data->this);
pw_impl_factory_destroy(data->factory);
return res;
}

33
src/modules/module-session-manager/endpoint.c
View file

@ -78,11 +78,12 @@ struct resource_data
struct factory_data
{
struct pw_impl_factory *this;
struct pw_impl_module *module;
struct spa_hook module_listener;
struct pw_impl_factory *factory;
struct spa_hook factory_listener;
struct pw_export_type export;
};
@ -472,7 +473,7 @@ static void *create_object(void *data,
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_impl_client_get_info(client)->id);
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_impl_factory_get_info(d->this)->id);
pw_impl_factory_get_info(d->factory)->id);
result = endpoint_new(pw_impl_client_get_context(client), impl_resource, properties);
if (result == NULL) {
@ -502,20 +503,37 @@ static const struct pw_impl_factory_implementation impl_factory = {
.create_object = create_object,
};
static void factory_destroy(void *data)
{
struct factory_data *d = data;
spa_hook_remove(&d->factory_listener);
d->factory = NULL;
if (d->module)
pw_impl_module_destroy(d->module);
}
static const struct pw_impl_factory_events factory_events = {
PW_VERSION_IMPL_FACTORY_EVENTS,
.destroy = factory_destroy,
};
static void module_destroy(void *data)
{
struct factory_data *d = data;
spa_hook_remove(&d->module_listener);
spa_list_remove(&d->export.link);
pw_impl_factory_destroy(d->this);
d->module = NULL;
if (d->factory)
pw_impl_factory_destroy(d->factory);
}
static void module_registered(void *data)
{
struct factory_data *d = data;
struct pw_impl_module *module = d->module;
struct pw_impl_factory *factory = d->this;
struct pw_impl_factory *factory = d->factory;
struct spa_dict_item items[1];
char id[16];
int res;
@ -552,7 +570,7 @@ int endpoint_factory_init(struct pw_impl_module *module)
return -errno;
data = pw_impl_factory_get_user_data(factory);
data->this = factory;
data->factory = factory;
data->module = module;
pw_impl_factory_set_implementation(factory, &impl_factory, data);
@ -562,10 +580,11 @@ int endpoint_factory_init(struct pw_impl_module *module)
if ((res = pw_context_register_export_type(context, &data->export)) < 0)
goto error;
pw_impl_factory_add_listener(factory, &data->factory_listener, &factory_events, data);
pw_impl_module_add_listener(module, &data->module_listener, &module_events, data);
return 0;
error:
pw_impl_factory_destroy(data->this);
pw_impl_factory_destroy(data->factory);
return res;
}

32
src/modules/module-session-manager/session.c
View file

@ -78,11 +78,12 @@ struct resource_data
struct factory_data
{
struct pw_impl_factory *this;
struct pw_impl_module *module;
struct spa_hook module_listener;
struct pw_impl_factory *factory;
struct spa_hook factory_listener;
struct pw_export_type export;
};
@ -461,7 +462,7 @@ static void *create_object(void *data,
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_impl_client_get_info(client)->id);
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_impl_factory_get_info(d->this)->id);
pw_impl_factory_get_info(d->factory)->id);
result = session_new(pw_impl_client_get_context(client), impl_resource, properties);
if (result == NULL) {
@ -491,20 +492,36 @@ static const struct pw_impl_factory_implementation impl_factory = {
.create_object = create_object,
};
static void factory_destroy(void *data)
{
struct factory_data *d = data;
spa_hook_remove(&d->factory_listener);
d->factory = NULL;
if (d->module)
pw_impl_module_destroy(d->module);
}
static const struct pw_impl_factory_events factory_events = {
PW_VERSION_IMPL_FACTORY_EVENTS,
.destroy = factory_destroy,
};
static void module_destroy(void *data)
{
struct factory_data *d = data;
spa_hook_remove(&d->module_listener);
spa_list_remove(&d->export.link);
pw_impl_factory_destroy(d->this);
d->module = NULL;
if (d->factory)
pw_impl_factory_destroy(d->factory);
}
static void module_registered(void *data)
{
struct factory_data *d = data;
struct pw_impl_module *module = d->module;
struct pw_impl_factory *factory = d->this;
struct pw_impl_factory *factory = d->factory;
struct spa_dict_item items[1];
char id[16];
int res;
@ -541,7 +558,7 @@ int session_factory_init(struct pw_impl_module *module)
return -errno;
data = pw_impl_factory_get_user_data(factory);
data->this = factory;
data->factory = factory;
data->module = module;
pw_impl_factory_set_implementation(factory, &impl_factory, data);
@ -551,10 +568,11 @@ int session_factory_init(struct pw_impl_module *module)
if ((res = pw_context_register_export_type(context, &data->export)) < 0)
goto error;
pw_impl_factory_add_listener(factory, &data->factory_listener, &factory_events, data);
pw_impl_module_add_listener(module, &data->module_listener, &module_events, data);
return 0;
error:
pw_impl_factory_destroy(data->this);
pw_impl_factory_destroy(data->factory);
return res;
}