mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

netjack2: improve shutdown

Browse source 
Destroy the sources from the io handler immediately when there is an
error so that we don't end up in endless error wakeups.

Schedule the free from the main loop and make sure only one can ever
run.
This commit is contained in:
Wim Taymans 2025-04-30 11:00:42 +02:00
parent 743d86500c
commit a9083c7519
1 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/modules/module-netjack2-manager.c
View file

@ -236,6 +236,7 @@ struct follower {
unsigned int done:1; unsigned int done:1;
unsigned int new_xrun:1; unsigned int new_xrun:1;
unsigned int started:1; unsigned int started:1;
unsigned int freeing:1;
}; };
struct impl { struct impl {
@ -289,6 +290,7 @@ static void stream_destroy(void *d)
struct stream *s = d; struct stream *s = d;
uint32_t i; uint32_t i;
s->running = false;
spa_hook_remove(&s->listener); spa_hook_remove(&s->listener);
for (i = 0; i < s->n_ports; i++) for (i = 0; i < s->n_ports; i++)
s->ports[i] = NULL; s->ports[i] = NULL;
@ -400,20 +402,35 @@ static void follower_free(struct follower *follower)
{ {
struct impl *impl = follower->impl; struct impl *impl = follower->impl;
if (follower->freeing)
return;
follower->freeing = true;
spa_list_remove(&follower->link); spa_list_remove(&follower->link);
if (follower->source.filter) if (follower->socket) {
pw_loop_destroy_source(impl->data_loop, follower->socket);
follower->socket = NULL;
}
if (follower->setup_socket) {
pw_loop_destroy_source(impl->main_loop, follower->setup_socket);
follower->setup_socket = NULL;
}
if (follower->source.filter) {
pw_filter_destroy(follower->source.filter); pw_filter_destroy(follower->source.filter);
if (follower->sink.filter) follower->source.filter = NULL;
}
if (follower->sink.filter) {
pw_filter_destroy(follower->sink.filter); pw_filter_destroy(follower->sink.filter);
follower->sink.filter = NULL;
}
pw_properties_free(follower->source.props); pw_properties_free(follower->source.props);
follower->source.props = NULL;
pw_properties_free(follower->sink.props); pw_properties_free(follower->sink.props);
follower->sink.props = NULL;
if (follower->socket)
pw_loop_destroy_source(impl->data_loop, follower->socket);
if (follower->setup_socket)
pw_loop_destroy_source(impl->main_loop, follower->setup_socket);
netjack2_cleanup(&follower->peer); netjack2_cleanup(&follower->peer);
free(follower); free(follower);
@ -447,10 +464,13 @@ static void
on_setup_io(void *data, int fd, uint32_t mask) on_setup_io(void *data, int fd, uint32_t mask)
{ {
struct follower *follower = data; struct follower *follower = data;
struct impl *impl = follower->impl;
if (mask & (SPA_IO_ERR | SPA_IO_HUP)) { if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
pw_log_warn("error:%08x", mask); pw_log_warn("error:%08x", mask);
stop_follower(follower); pw_loop_destroy_source(impl->main_loop, follower->setup_socket);
follower->setup_socket = NULL;
pw_loop_invoke(impl->main_loop, do_stop_follower, 0, NULL, 0, false, follower);
return; return;
} }
if (mask & SPA_IO_IN) { if (mask & SPA_IO_IN) {
@ -493,7 +513,8 @@ on_data_io(void *data, int fd, uint32_t mask)
if (mask & (SPA_IO_ERR | SPA_IO_HUP)) { if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
pw_log_warn("error:%08x", mask); pw_log_warn("error:%08x", mask);
pw_loop_update_io(impl->data_loop, follower->socket, 0); pw_loop_destroy_source(impl->data_loop, follower->socket);
follower->socket = NULL;
pw_loop_invoke(impl->main_loop, do_stop_follower, 0, NULL, 0, false, follower); pw_loop_invoke(impl->main_loop, do_stop_follower, 0, NULL, 0, false, follower);
return; return;
} }