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

connection: debug when we close fd

Browse source 
Also handle DUP failure.
This commit is contained in:
Wim Taymans 2022-04-20 12:09:42 +02:00
parent a112446dab
commit cc7aadde8a
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -140,8 +140,13 @@ uint32_t pw_protocol_native_connection_add_fd(struct pw_protocol_native_connecti
} }
buf->msg.fds[index] = fcntl(fd, F_DUPFD_CLOEXEC, 0); buf->msg.fds[index] = fcntl(fd, F_DUPFD_CLOEXEC, 0);
if (buf->msg.fds[index] == -1) {
pw_log_error("connection %p: can't DUP fd:%d %m", conn, fd);
return SPA_IDX_INVALID;
}
buf->msg.n_fds++; buf->msg.n_fds++;
pw_log_debug("connection %p: add fd %d at index %d", conn, fd, index); pw_log_debug("connection %p: add fd %d (new fd:%d) at index %d",
conn, fd, buf->msg.fds[index], index);
return index; return index;
} }
@ -198,6 +203,7 @@ static void close_all_fds(struct msghdr *msg, struct cmsghdr *from)
int fd; int fd;
memcpy(&fd, p, sizeof(fd)); memcpy(&fd, p, sizeof(fd));
pw_log_debug("%p: close fd:%d", msg, fd);
close(fd); close(fd);
} }
} }
@ -275,9 +281,11 @@ static void clear_buffer(struct buffer *buf, bool fds)
{ {
uint32_t i; uint32_t i;
if (fds) { if (fds) {
for (i = 0; i < buf->n_fds; i++) for (i = 0; i < buf->n_fds; i++) {
pw_log_debug("%p: close fd:%d", buf, buf->fds[i]);
close(buf->fds[i]); close(buf->fds[i]);
} }
}
buf->n_fds = 0; buf->n_fds = 0;
buf->buffer_size = 0; buf->buffer_size = 0;
buf->offset = 0; buf->offset = 0;
@ -813,8 +821,10 @@ exit:
if (size > 0) if (size > 0)
memmove(buf->buffer_data, data, size); memmove(buf->buffer_data, data, size);
buf->buffer_size = size; buf->buffer_size = size;
for (i = 0; i < to_close; i++) for (i = 0; i < to_close; i++) {
pw_log_debug("%p: close fd:%d", conn, buf->fds[i]);
close(buf->fds[i]); close(buf->fds[i]);
}
if (n_fds > 0) if (n_fds > 0)
memmove(buf->fds, fds, n_fds * sizeof(int)); memmove(buf->fds, fds, n_fds * sizeof(int));
buf->n_fds = n_fds; buf->n_fds = n_fds;

1
src/pipewire/mem.c
View file

@ -545,6 +545,7 @@ struct pw_memblock * pw_mempool_alloc(struct pw_mempool *pool, enum pw_memblock_
return &b->this; return &b->this;
error_close: error_close:
pw_log_debug("%p: close fd:%d", pool, b->this.fd);
close(b->this.fd); close(b->this.fd);
error_free: error_free:
free(b); free(b);