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

client-node: free old mapping only after importing the new

Browse source 
Keep the old mapping around until we manage to successfully import
the new mapping.
This commit is contained in:
Wim Taymans 2020-07-10 12:57:55 +02:00
parent 0430e7b8dc
commit 5cd495c93c
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/modules/module-client-node/client-node.c
View file

@ -362,15 +362,14 @@ static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
{ {
struct node *this = object; struct node *this = object;
struct impl *impl = this->impl; struct impl *impl = this->impl;
struct pw_memmap *mm; struct pw_memmap *mm, *old;
uint32_t memid, mem_offset, mem_size; uint32_t memid, mem_offset, mem_size;
uint32_t tag[5] = { impl->node_id, id, }; uint32_t tag[5] = { impl->node_id, id, };
if (impl->this.flags & 1) if (impl->this.flags & 1)
return 0; return 0;
if ((mm = pw_mempool_find_tag(this->client->pool, tag, sizeof(tag))) != NULL) old = pw_mempool_find_tag(this->client->pool, tag, sizeof(tag));
pw_memmap_free(mm);
if (data) { if (data) {
mm = pw_mempool_import_map(this->client->pool, mm = pw_mempool_import_map(this->client->pool,
@ -386,6 +385,8 @@ static int impl_node_set_io(void *object, uint32_t id, void *data, size_t size)
memid = SPA_ID_INVALID; memid = SPA_ID_INVALID;
mem_offset = mem_size = 0; mem_offset = mem_size = 0;
} }
if (old != NULL)
pw_memmap_free(old);
if (this->resource == NULL) if (this->resource == NULL)
return data == NULL ? 0 : -EIO; return data == NULL ? 0 : -EIO;
@ -674,7 +675,7 @@ static int do_port_set_io(struct impl *impl,
struct port *port; struct port *port;
struct mix *mix; struct mix *mix;
uint32_t tag[5] = { impl->node_id, direction, port_id, mix_id, id }; uint32_t tag[5] = { impl->node_id, direction, port_id, mix_id, id };
struct pw_memmap *mm; struct pw_memmap *mm, *old;
pw_log_debug(NAME " %p: %s port %d.%d set io %p %zd", this, pw_log_debug(NAME " %p: %s port %d.%d set io %p %zd", this,
direction == SPA_DIRECTION_INPUT ? "input" : "output", direction == SPA_DIRECTION_INPUT ? "input" : "output",
@ -688,8 +689,7 @@ static int do_port_set_io(struct impl *impl,
if ((mix = find_mix(port, mix_id)) == NULL || !mix->valid) if ((mix = find_mix(port, mix_id)) == NULL || !mix->valid)
return -EINVAL; return -EINVAL;
if ((mm = pw_mempool_find_tag(this->client->pool, tag, sizeof(tag))) != NULL) old = pw_mempool_find_tag(this->client->pool, tag, sizeof(tag));
pw_memmap_free(mm);
if (data) { if (data) {
mm = pw_mempool_import_map(this->client->pool, mm = pw_mempool_import_map(this->client->pool,
@ -705,6 +705,8 @@ static int do_port_set_io(struct impl *impl,
memid = SPA_ID_INVALID; memid = SPA_ID_INVALID;
mem_offset = mem_size = 0; mem_offset = mem_size = 0;
} }
if (old != NULL)
pw_memmap_free(old);
if (this->resource == NULL) if (this->resource == NULL)
return data == NULL ? 0 : -EIO; return data == NULL ? 0 : -EIO;