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

protocol-native: keep client around while processing

Browse source 
When we process the messages of a client, keep the client around
because some callback might have disconnected and tried to free
us.
This commit is contained in:
Wim Taymans 2020-09-15 13:54:50 +02:00
parent 8332d3e3ed
commit 1a2e783a6f
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/modules/module-protocol-native.c
View file

@ -100,11 +100,19 @@ struct client {
struct pw_protocol_native_connection *connection; struct pw_protocol_native_connection *connection;
struct spa_hook conn_listener; struct spa_hook conn_listener;
int ref;
unsigned int disconnecting:1; unsigned int disconnecting:1;
unsigned int flushing:1; unsigned int flushing:1;
unsigned int paused:1; unsigned int paused:1;
}; };
static void client_unref(struct client *impl)
{
if (--impl->ref == 0)
free(impl);
}
struct server { struct server {
struct pw_protocol_server this; struct pw_protocol_server this;
@ -651,6 +659,7 @@ process_remote(struct client *impl)
struct pw_core *this = impl->this.core; struct pw_core *this = impl->this.core;
int res = 0; int res = 0;
impl->ref++;
while (!impl->disconnecting && !impl->paused) { while (!impl->disconnecting && !impl->paused) {
struct pw_proxy *proxy; struct pw_proxy *proxy;
const struct pw_protocol_native_demarshal *demarshal; const struct pw_protocol_native_demarshal *demarshal;
@ -659,8 +668,8 @@ process_remote(struct client *impl)
res = pw_protocol_native_connection_get_next(conn, &msg); res = pw_protocol_native_connection_get_next(conn, &msg);
if (res < 0) { if (res < 0) {
if (res == -EAGAIN) if (res == -EAGAIN)
break; res = 0;
return res; break;
} }
if (res == 0) if (res == 0)
break; break;
@ -692,7 +701,7 @@ process_remote(struct client *impl)
continue; continue;
} }
demarshal = marshal->client_demarshal; demarshal = marshal->client_demarshal;
if (!demarshal[msg->opcode].func) { if (!demarshal[msg->opcode].func) {
pw_log_error(NAME" %p: function %d not implemented on %u", pw_log_error(NAME" %p: function %d not implemented on %u",
this, msg->opcode, msg->id); this, msg->opcode, msg->id);
@ -703,13 +712,14 @@ process_remote(struct client *impl)
pw_proxy_unref(proxy); pw_proxy_unref(proxy);
if (res < 0) { if (res < 0) {
pw_log_error(NAME" %p: invalid message received %u for %u", pw_log_error(NAME" %p: invalid message received %u for %u: %s",
this, msg->opcode, msg->id); this, msg->opcode, msg->id, spa_strerror(res));
debug_msg("*invalid*", msg, true); debug_msg("*invalid*", msg, true);
continue;
} }
res = 0;
} }
return 0; client_unref(impl);
return res;
} }
static void static void
@ -826,7 +836,7 @@ static void impl_destroy(struct pw_protocol_client *client)
impl_disconnect(client); impl_disconnect(client);
spa_list_remove(&client->link); spa_list_remove(&client->link);
free(impl); client_unref(impl);
} }
static int impl_set_paused(struct pw_protocol_client *client, bool paused) static int impl_set_paused(struct pw_protocol_client *client, bool paused)
@ -910,6 +920,7 @@ impl_new_client(struct pw_protocol *protocol,
this->protocol = protocol; this->protocol = protocol;
this->core = core; this->core = core;
impl->ref = 1;
impl->context = protocol->context; impl->context = protocol->context;
impl->connection = pw_protocol_native_connection_new(protocol->context, -1); impl->connection = pw_protocol_native_connection_new(protocol->context, -1);
if (impl->connection == NULL) { if (impl->connection == NULL) {