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

remote-node: avoid map and unmap for our own node

Browse source
This commit is contained in:
Wim Taymans 2019-08-21 20:35:28 +02:00
parent 8ed3cfe679
commit 9351b14bf4
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -795,13 +795,19 @@ client_node_set_activation(void *object,
struct node_data *data = proxy->user_data; struct node_data *data = proxy->user_data;
struct pw_node *node = data->node; struct pw_node *node = data->node;
struct pw_memmap *mm; struct pw_memmap *mm;
struct pw_node_activation *ptr; void *ptr;
struct link *link; struct link *link;
int res = 0; int res = 0;
if (data->remote_id == node_id) {
pw_log_debug("node %p: our activation %u: %u %u %u", node, node_id,
memid, offset, size);
close(signalfd);
return 0;
}
if (memid == SPA_ID_INVALID) { if (memid == SPA_ID_INVALID) {
ptr = NULL; mm = ptr = NULL;
mm = NULL;
size = 0; size = 0;
} }
else { else {
@ -815,14 +821,6 @@ client_node_set_activation(void *object,
} }
pw_log_debug("node %p: set activation %d %p %u %u", node, node_id, ptr, offset, size); pw_log_debug("node %p: set activation %d %p %u %u", node, node_id, ptr, offset, size);
if (data->remote_id == node_id) {
pw_log_debug("node %p: our activation %u: %u %u %u %p", node, node_id,
memid, offset, size, ptr);
if (mm)
pw_memmap_free(mm);
close(signalfd);
return 0;
}
if (ptr) { if (ptr) {
link = pw_array_add(&data->links, sizeof(struct link)); link = pw_array_add(&data->links, sizeof(struct link));

1
src/pipewire/node.c
View file

@ -901,7 +901,6 @@ struct pw_node *pw_node_new(struct pw_core *core,
goto error_clean; goto error_clean;
} }
impl->work = pw_work_queue_new(this->core->main_loop); impl->work = pw_work_queue_new(this->core->main_loop);
if (impl->work == NULL) { if (impl->work == NULL) {
res = -errno; res = -errno;