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

client-node: track and free activation memory

Browse source
This commit is contained in:
Wim Taymans 2019-07-19 13:50:58 +02:00
parent 6820806409
commit b23ca2e24d
2 changed files with 42 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -252,6 +252,17 @@ found:
return m; return m;
} }
static inline struct mem *find_mem_fd(struct impl *impl, int fd)
{
struct mem *m;
pw_array_for_each(m, &impl->mems) {
if (m->fd == fd)
return m;
}
return NULL;
}
static struct mix *find_mix(struct port *p, uint32_t mix_id) static struct mix *find_mix(struct port *p, uint32_t mix_id)
{ {
struct mix *mix; struct mix *mix;
@ -296,10 +307,10 @@ static struct mix *ensure_mix(struct impl *impl, struct port *p, uint32_t mix_id
static void clear_io(struct node *node, struct io *io) static void clear_io(struct node *node, struct io *io)
{ {
struct mem *m; struct mem *m;
spa_log_debug(node->log, "node %p: clear io %p %d %d", node, io, io->id, io->memid);
m = pw_array_get_unchecked(&node->impl->mems, io->memid, struct mem); m = pw_array_get_unchecked(&node->impl->mems, io->memid, struct mem);
m->ref--; m->ref--;
io->id = SPA_ID_INVALID; io->id = SPA_ID_INVALID;
spa_log_debug(node->log, "node %p: clear io %p %d mem %u %d", node, io, io->id, io->memid, m->ref);
} }
static struct io *update_io(struct node *this, static struct io *update_io(struct node *this,
@ -776,8 +787,7 @@ static int do_port_set_io(struct impl *impl,
return -EINVAL; return -EINVAL;
mem_offset = SPA_PTRDIFF(data, mem->ptr); mem_offset = SPA_PTRDIFF(data, mem->ptr);
mem_size = mem->size; if (mem_offset + size > mem->size)
if (mem_size - mem_offset < size)
return -EINVAL; return -EINVAL;
mem_offset += mem->offset; mem_offset += mem->offset;
@ -785,6 +795,7 @@ static int do_port_set_io(struct impl *impl,
if (m == NULL) if (m == NULL)
return -errno; return -errno;
memid = m->id; memid = m->id;
mem_size = size;
} }
else { else {
memid = SPA_ID_INVALID; memid = SPA_ID_INVALID;
@ -1622,10 +1633,22 @@ static void node_peer_removed(void *data, struct pw_node *peer)
{ {
struct impl *impl = data; struct impl *impl = data;
struct node *this = &impl->node; struct node *this = &impl->node;
struct mem *m;
if (this->resource == NULL) if (this->resource == NULL)
return; return;
m = find_mem_fd(impl, peer->activation->fd);
if (m == NULL) {
pw_log_warn(NAME " %p: unknown peer %p fd:%d", &impl->this, peer,
peer->source.fd);
return;
}
m->ref--;
pw_log_debug(NAME " %p: peer %p %u removed", &impl->this, peer,
peer->info.id);
pw_client_node_resource_set_activation(this->resource, pw_client_node_resource_set_activation(this->resource,
peer->info.id, peer->info.id,
-1, -1,
@ -1636,6 +1659,10 @@ static void node_peer_removed(void *data, struct pw_node *peer)
static void node_driver_changed(void *data, struct pw_node *old, struct pw_node *driver) static void node_driver_changed(void *data, struct pw_node *old, struct pw_node *driver)
{ {
struct impl *impl = data;
pw_log_debug(NAME " %p: driver changed %p -> %p", &impl->this, old, driver);
node_peer_removed(data, old); node_peer_removed(data, old);
node_peer_added(data, driver); node_peer_added(data, driver);
} }

17
src/modules/module-client-node/remote-node.c
View file

@ -141,7 +141,7 @@ static struct mem *find_mem_ptr(struct node_data *data, void *ptr)
{ {
struct mem *m; struct mem *m;
pw_array_for_each(m, &data->mems) { pw_array_for_each(m, &data->mems) {
if (m->map.ptr == ptr) if (ptr >= m->map.ptr && ptr < SPA_MEMBER(m->map.ptr, m->map.map.size, void))
return m; return m;
} }
return NULL; return NULL;
@ -208,8 +208,13 @@ static void clear_mem(struct node_data *data, struct mem *m)
static void clear_link(struct node_data *data, struct link *link) static void clear_link(struct node_data *data, struct link *link)
{ {
struct mem *m;
link->node_id = SPA_ID_INVALID; link->node_id = SPA_ID_INVALID;
link->target.activation = NULL; link->target.activation = NULL;
m = find_mem(data, link->mem_id);
if (m && --m->ref == 0)
clear_mem(data, m);
close(link->signalfd); close(link->signalfd);
spa_list_remove(&link->target.link); spa_list_remove(&link->target.link);
} }
@ -873,8 +878,8 @@ client_node_port_set_io(void *object,
m->ref++; m->ref++;
} }
pw_log_debug("port %p: set io %s %p", mix->port, pw_log_debug("port %p: set io %s %p %p", mix->port,
spa_debug_type_find_name(spa_type_io, id), ptr); spa_debug_type_find_name(spa_type_io, id), ptr, mix->mix.io);
if (id == SPA_IO_Buffers) { if (id == SPA_IO_Buffers) {
if (ptr == NULL && mix->mix.io) { if (ptr == NULL && mix->mix.io) {
@ -954,7 +959,7 @@ client_node_set_activation(void *object,
} }
m->ref++; m->ref++;
} }
pw_log_debug("node %p: set activation %d", node, node_id); pw_log_debug("node %p: set activation %d %p %u %u", node, node_id, ptr, offset, size);
if (data->remote_id == node_id) { if (data->remote_id == node_id) {
pw_log_debug("node %p: our activation %u: %u %u %u %p", node, node_id, pw_log_debug("node %p: our activation %u: %u %u %u %p", node, node_id,
@ -978,7 +983,9 @@ client_node_set_activation(void *object,
link->target.node = NULL; link->target.node = NULL;
spa_list_append(&node->rt.target_list, &link->target.link); spa_list_append(&node->rt.target_list, &link->target.link);
pw_log_debug("node %p: state %p required %d, pending %d", node, pw_log_debug("node %p: link %p: fd:%d id:%u state %p required %d, pending %d",
node, link, signalfd,
link->target.activation->position.clock.id,
&link->target.activation->state[0], &link->target.activation->state[0],
link->target.activation->state[0].required, link->target.activation->state[0].required,
link->target.activation->state[0].pending); link->target.activation->state[0].pending);