From 05b3c666d9b16c39e64b289fbb4c95e0445aec1c Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 14 Mar 2018 20:17:36 +0100 Subject: [PATCH] improve debug --- src/modules/module-client-node/client-node.c | 8 ++++++-- src/pipewire/stream.c | 11 +++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/modules/module-client-node/client-node.c b/src/modules/module-client-node/client-node.c index ac6b4cccc..0dcf29dcf 100644 --- a/src/modules/module-client-node/client-node.c +++ b/src/modules/module-client-node/client-node.c @@ -1287,13 +1287,17 @@ static int mix_port_set_io(struct spa_node *node, static int mix_port_process_input(struct spa_node *data) { - pw_log_trace("client-node %p: pass", data); + struct pw_port *p = SPA_CONTAINER_OF(data, struct pw_port, mix_node); + struct spa_io_buffers *io = p->rt.mix_port.io; + pw_log_trace("client-node %p: pass %d %d", data, io->status, io->buffer_id); return SPA_STATUS_HAVE_BUFFER; } static int mix_port_process_output(struct spa_node *data) { - pw_log_trace("client-node %p: pass", data); + struct pw_port *p = SPA_CONTAINER_OF(data, struct pw_port, mix_node); + struct spa_io_buffers *io = p->rt.mix_port.io; + pw_log_trace("client-node %p: pass %d %d", data, io->status, io->buffer_id); return SPA_STATUS_NEED_BUFFER; } diff --git a/src/pipewire/stream.c b/src/pipewire/stream.c index 5866bb9e6..39a37ef3d 100644 --- a/src/pipewire/stream.c +++ b/src/pipewire/stream.c @@ -140,7 +140,11 @@ static void *mem_map(struct pw_stream *stream, struct pw_map_range *range, pw_log_error("stream %p: Failed to mmap memory %d: %m", stream, size); return NULL; } - return SPA_MEMBER(ptr, range->start, void); + + ptr = SPA_MEMBER(ptr, range->start, void); + pw_log_debug("stream %p: fd %d mapped %d %d %p", stream, fd, offset, size, ptr); + + return ptr; } static void *mem_unmap(struct stream *impl, void *ptr, struct pw_map_range *range) @@ -193,7 +197,10 @@ static void clear_buffers(struct pw_stream *stream) for (i = 0; i < b->n_mem; i++) { struct buffer_mem *bm = &b->mem[i]; struct mem *m; - pw_log_debug("stream %p: clear buffer mem %d", stream, bm->mem_id); + + pw_log_debug("stream %p: clear buffer %d mem %d", + stream, b->id, bm->mem_id); + m = find_mem(stream, bm->mem_id); if (m && --m->ref == 0) clear_mem(impl, m);