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: use Fd pod for fd indexes for easier debugging

Browse source
This commit is contained in:
Wim Taymans 2019-08-16 15:11:04 +02:00
parent 8da7222c7e
commit 2f28e59c63
3 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/modules/module-client-node/protocol-native.c
View file

@ -294,7 +294,7 @@ client_node_marshal_port_buffers(void *object,
struct spa_data *d = &buf->datas[j]; struct spa_data *d = &buf->datas[j];
spa_pod_builder_add(b, spa_pod_builder_add(b,
SPA_POD_Id(d->type), SPA_POD_Id(d->type),
SPA_POD_Int(pw_protocol_native_add_proxy_fd(proxy, d->fd)), SPA_POD_Fd(pw_protocol_native_add_proxy_fd(proxy, d->fd)),
SPA_POD_Int(d->flags), SPA_POD_Int(d->flags),
SPA_POD_Int(d->mapoffset), SPA_POD_Int(d->mapoffset),
SPA_POD_Int(d->maxsize), NULL); SPA_POD_Int(d->maxsize), NULL);
@ -315,8 +315,8 @@ static int client_node_demarshal_transport(void *object, const struct pw_protoco
spa_pod_parser_init(&prs, msg->data, msg->size); spa_pod_parser_init(&prs, msg->data, msg->size);
if (spa_pod_parser_get_struct(&prs, if (spa_pod_parser_get_struct(&prs,
SPA_POD_Int(&node_id), SPA_POD_Int(&node_id),
SPA_POD_Int(&ridx), SPA_POD_Fd(&ridx),
SPA_POD_Int(&widx), SPA_POD_Fd(&widx),
SPA_POD_Int(&mem_id), SPA_POD_Int(&mem_id),
SPA_POD_Int(&offset), SPA_POD_Int(&offset),
SPA_POD_Int(&sz)) < 0) SPA_POD_Int(&sz)) < 0)
@ -552,15 +552,13 @@ static int client_node_demarshal_set_activation(void *object, const struct pw_pr
spa_pod_parser_init(&prs, msg->data, msg->size); spa_pod_parser_init(&prs, msg->data, msg->size);
if (spa_pod_parser_get_struct(&prs, if (spa_pod_parser_get_struct(&prs,
SPA_POD_Int(&node_id), SPA_POD_Int(&node_id),
SPA_POD_Int(&sigidx), SPA_POD_Fd(&sigidx),
SPA_POD_Int(&memid), SPA_POD_Int(&memid),
SPA_POD_Int(&off), SPA_POD_Int(&off),
SPA_POD_Int(&sz)) < 0) SPA_POD_Int(&sz)) < 0)
return -EINVAL; return -EINVAL;
signalfd = pw_protocol_native_get_proxy_fd(proxy, sigidx); signalfd = pw_protocol_native_get_proxy_fd(proxy, sigidx);
if (signalfd < 0)
return -EINVAL;
pw_proxy_notify(proxy, struct pw_client_node_proxy_events, set_activation, 0, pw_proxy_notify(proxy, struct pw_client_node_proxy_events, set_activation, 0,
node_id, node_id,
@ -600,8 +598,8 @@ static int client_node_marshal_transport(void *object, uint32_t node_id, int rea
spa_pod_builder_add_struct(b, spa_pod_builder_add_struct(b,
SPA_POD_Int(node_id), SPA_POD_Int(node_id),
SPA_POD_Int(pw_protocol_native_add_resource_fd(resource, readfd)), SPA_POD_Fd(pw_protocol_native_add_resource_fd(resource, readfd)),
SPA_POD_Int(pw_protocol_native_add_resource_fd(resource, writefd)), SPA_POD_Fd(pw_protocol_native_add_resource_fd(resource, writefd)),
SPA_POD_Int(mem_id), SPA_POD_Int(mem_id),
SPA_POD_Int(offset), SPA_POD_Int(offset),
SPA_POD_Int(size)); SPA_POD_Int(size));
@ -811,7 +809,7 @@ client_node_marshal_set_activation(void *object,
spa_pod_builder_add_struct(b, spa_pod_builder_add_struct(b,
SPA_POD_Int(node_id), SPA_POD_Int(node_id),
SPA_POD_Int(pw_protocol_native_add_resource_fd(resource, signalfd)), SPA_POD_Fd(pw_protocol_native_add_resource_fd(resource, signalfd)),
SPA_POD_Int(memid), SPA_POD_Int(memid),
SPA_POD_Int(offset), SPA_POD_Int(offset),
SPA_POD_Int(size)); SPA_POD_Int(size));
@ -1074,7 +1072,7 @@ static int client_node_demarshal_port_buffers(void *object, const struct pw_prot
if (spa_pod_parser_get(&prs, if (spa_pod_parser_get(&prs,
SPA_POD_Id(&d->type), SPA_POD_Id(&d->type),
SPA_POD_Int(&data_id), SPA_POD_Fd(&data_id),
SPA_POD_Int(&d->flags), SPA_POD_Int(&d->flags),
SPA_POD_Int(&d->mapoffset), SPA_POD_Int(&d->mapoffset),
SPA_POD_Int(&d->maxsize), NULL) < 0) SPA_POD_Int(&d->maxsize), NULL) < 0)

4
src/modules/module-protocol-native/connection.c
View file

@ -196,7 +196,7 @@ static int refill_buffer(struct pw_protocol_native_connection *conn, struct buff
/* ERRORS */ /* ERRORS */
recv_error: recv_error:
pw_log_error("could not recvmsg on fd %d: %s", conn->fd, strerror(errno)); pw_log_error("could not recvmsg on fd:%d: %s", conn->fd, strerror(errno));
return -errno; return -errno;
} }
@ -517,7 +517,7 @@ int pw_protocol_native_connection_flush(struct pw_protocol_native_connection *co
/* ERRORS */ /* ERRORS */
send_error: send_error:
res = -errno; res = -errno;
pw_log_error("could not sendmsg: %s", strerror(errno)); pw_log_error("could not sendmsg on fd:%d n_fds:%d: %s", conn->fd, n_fds, strerror(errno));
return res; return res;
} }

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

@ -346,7 +346,7 @@ static int core_event_demarshal_add_mem(void *object, const struct pw_protocol_n
if (spa_pod_parser_get_struct(&prs, if (spa_pod_parser_get_struct(&prs,
SPA_POD_Int(&id), SPA_POD_Int(&id),
SPA_POD_Id(&type), SPA_POD_Id(&type),
SPA_POD_Int(&idx), SPA_POD_Fd(&idx),
SPA_POD_Int(&flags)) < 0) SPA_POD_Int(&flags)) < 0)
return -EINVAL; return -EINVAL;
@ -462,7 +462,7 @@ static void core_event_marshal_add_mem(void *object, uint32_t id, uint32_t type,
spa_pod_builder_add_struct(b, spa_pod_builder_add_struct(b,
SPA_POD_Int(id), SPA_POD_Int(id),
SPA_POD_Id(type), SPA_POD_Id(type),
SPA_POD_Int(pw_protocol_native_add_resource_fd(resource, fd)), SPA_POD_Fd(pw_protocol_native_add_resource_fd(resource, fd)),
SPA_POD_Int(flags)); SPA_POD_Int(flags));
pw_protocol_native_end_resource(resource, b); pw_protocol_native_end_resource(resource, b);