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

remote-node: improve some errors

Browse source
This commit is contained in:
Wim Taymans 2019-03-12 09:07:33 +01:00
parent 743874dd9f
commit 776ed79b86
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -201,7 +201,7 @@ static void *mem_map(struct node_data *data, struct mapping *map,
if (map->ptr == NULL || map->map.offset != m.map.offset || map->map.size != m.map.size) { if (map->ptr == NULL || map->map.offset != m.map.offset || map->map.size != m.map.size) {
m.ptr = mmap(map->ptr, m.map.size, prot, MAP_SHARED, fd, m.map.offset); m.ptr = mmap(map->ptr, m.map.size, prot, MAP_SHARED, fd, m.map.offset);
if (m.ptr == MAP_FAILED) { if (m.ptr == MAP_FAILED) {
pw_log_error("remote %p: Failed to mmap memory %d: %m", data, size); pw_log_error("remote %p: Failed to mmap memory %d size:%d: %m", data, fd, size);
return NULL; return NULL;
} }
map->map = m.map; map->map = m.map;
@ -573,8 +573,10 @@ client_node_set_io(void *object,
} }
ptr = mem_map(data, &m->map, m->fd, ptr = mem_map(data, &m->map, m->fd,
PROT_READ|PROT_WRITE, offset, size); PROT_READ|PROT_WRITE, offset, size);
if (ptr == NULL) if (ptr == NULL) {
pw_proxy_error(proxy, -errno, "set_io: mmap failed: %m");
return -errno; return -errno;
}
m->ref++; m->ref++;
} }
@ -789,7 +791,7 @@ client_node_port_use_buffers(void *object,
buffers[i].offset, buffers[i].size); buffers[i].offset, buffers[i].size);
if (bmem.map.ptr == NULL) { if (bmem.map.ptr == NULL) {
res = -errno; res = -errno;
pw_proxy_error(proxy, res, "can't mmap memory: %s", spa_strerror(res)); pw_proxy_error(proxy, res, "use_buffers: can't mmap memory: %m");
goto cleanup; goto cleanup;
} }
if (mlock(bmem.map.ptr, bmem.map.map.size) < 0) if (mlock(bmem.map.ptr, bmem.map.map.size) < 0)
@ -929,7 +931,7 @@ client_node_port_set_io(void *object,
PROT_READ|PROT_WRITE, offset, size); PROT_READ|PROT_WRITE, offset, size);
if (ptr == NULL) { if (ptr == NULL) {
res = -errno; res = -errno;
pw_proxy_error(proxy, res, "mmap failed: %s", spa_strerror(res)); pw_proxy_error(proxy, res, "port_set_io: mmap failed: %m");
return res; return res;
} }
@ -1008,9 +1010,8 @@ client_node_set_activation(void *object,
ptr = mem_map(data, &m->map, m->fd, ptr = mem_map(data, &m->map, m->fd,
PROT_READ|PROT_WRITE, offset, size); PROT_READ|PROT_WRITE, offset, size);
if (ptr == NULL) { if (ptr == NULL) {
res = -errno; pw_proxy_error(proxy, -errno, "set_activation: mmap failed: %m");
pw_proxy_error(proxy, res, "mmap failed: %s", spa_strerror(res)); return -errno;
return res;
} }
m->ref++; m->ref++;
} }