From 2f28e59c6310be787b8a1425887ee232d1195ad9 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 16 Aug 2019 15:11:04 +0200 Subject: [PATCH] protocol: use Fd pod for fd indexes for easier debugging --- .../module-client-node/protocol-native.c | 18 ++++++++---------- .../module-protocol-native/connection.c | 4 ++-- .../module-protocol-native/protocol-native.c | 4 ++-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/modules/module-client-node/protocol-native.c b/src/modules/module-client-node/protocol-native.c index c511a8f1a..fc21282b3 100644 --- a/src/modules/module-client-node/protocol-native.c +++ b/src/modules/module-client-node/protocol-native.c @@ -294,7 +294,7 @@ client_node_marshal_port_buffers(void *object, struct spa_data *d = &buf->datas[j]; spa_pod_builder_add(b, 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->mapoffset), 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); if (spa_pod_parser_get_struct(&prs, SPA_POD_Int(&node_id), - SPA_POD_Int(&ridx), - SPA_POD_Int(&widx), + SPA_POD_Fd(&ridx), + SPA_POD_Fd(&widx), SPA_POD_Int(&mem_id), SPA_POD_Int(&offset), 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); if (spa_pod_parser_get_struct(&prs, SPA_POD_Int(&node_id), - SPA_POD_Int(&sigidx), + SPA_POD_Fd(&sigidx), SPA_POD_Int(&memid), SPA_POD_Int(&off), SPA_POD_Int(&sz)) < 0) return -EINVAL; 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, 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_Int(node_id), - SPA_POD_Int(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, readfd)), + SPA_POD_Fd(pw_protocol_native_add_resource_fd(resource, writefd)), SPA_POD_Int(mem_id), SPA_POD_Int(offset), SPA_POD_Int(size)); @@ -811,7 +809,7 @@ client_node_marshal_set_activation(void *object, spa_pod_builder_add_struct(b, 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(offset), 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, SPA_POD_Id(&d->type), - SPA_POD_Int(&data_id), + SPA_POD_Fd(&data_id), SPA_POD_Int(&d->flags), SPA_POD_Int(&d->mapoffset), SPA_POD_Int(&d->maxsize), NULL) < 0) diff --git a/src/modules/module-protocol-native/connection.c b/src/modules/module-protocol-native/connection.c index 5974c7ced..d916da508 100644 --- a/src/modules/module-protocol-native/connection.c +++ b/src/modules/module-protocol-native/connection.c @@ -196,7 +196,7 @@ static int refill_buffer(struct pw_protocol_native_connection *conn, struct buff /* ERRORS */ 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; } @@ -517,7 +517,7 @@ int pw_protocol_native_connection_flush(struct pw_protocol_native_connection *co /* ERRORS */ send_error: 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; } diff --git a/src/modules/module-protocol-native/protocol-native.c b/src/modules/module-protocol-native/protocol-native.c index 4f874da06..d6af94e07 100644 --- a/src/modules/module-protocol-native/protocol-native.c +++ b/src/modules/module-protocol-native/protocol-native.c @@ -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, SPA_POD_Int(&id), SPA_POD_Id(&type), - SPA_POD_Int(&idx), + SPA_POD_Fd(&idx), SPA_POD_Int(&flags)) < 0) 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_Int(id), 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)); pw_protocol_native_end_resource(resource, b);