From a2b391b5c7064ed6839b55aa6bca184403ed3f1d Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 7 Mar 2023 19:11:38 +0100 Subject: [PATCH] Improve debug log a little --- spa/plugins/audioconvert/audioconvert.c | 9 ++++++--- src/pipewire/context.c | 4 ++-- src/pipewire/impl-node.c | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/spa/plugins/audioconvert/audioconvert.c b/spa/plugins/audioconvert/audioconvert.c index c9802e351..2f979e670 100644 --- a/spa/plugins/audioconvert/audioconvert.c +++ b/spa/plugins/audioconvert/audioconvert.c @@ -1993,12 +1993,15 @@ static struct buffer *peek_buffer(struct impl *this, struct port *port) { struct buffer *b; - if (spa_list_is_empty(&port->queue)) + if (spa_list_is_empty(&port->queue)) { + spa_log_trace_fp(this->log, "%p: out of buffers on port %d %d", + this, port->id, port->n_buffers); return NULL; + } b = spa_list_first(&port->queue, struct buffer, link); - spa_log_trace_fp(this->log, "%p: peek buffer %d on port %d %u", - this, b->id, port->id, b->flags); + spa_log_trace_fp(this->log, "%p: peek buffer %d/%d on port %d %u", + this, b->id, port->n_buffers, port->id, b->flags); return b; } diff --git a/src/pipewire/context.c b/src/pipewire/context.c index 956b13fdf..da942c53b 100644 --- a/src/pipewire/context.c +++ b/src/pipewire/context.c @@ -792,12 +792,12 @@ static int collect_nodes(struct pw_context *context, struct pw_impl_node *node, /* now follow all the links from the nodes in the queue * and add the peers to the queue. */ spa_list_consume(n, &queue, sort_link) { - pw_log_debug(" next node %p: '%s'", n, n->name); - spa_list_remove(&n->sort_link); spa_list_append(collect, &n->sort_link); n->passive = !n->always_process; + pw_log_debug(" next node %p: '%s' passive:%u", n, n->name, n->passive); + if (!n->active) continue; diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c index c9b26586a..d70899036 100644 --- a/src/pipewire/impl-node.c +++ b/src/pipewire/impl-node.c @@ -1108,7 +1108,7 @@ static inline int process_node(void *data) a->status = PW_NODE_ACTIVATION_AWAKE; a->awake_time = SPA_TIMESPEC_TO_NSEC(&ts); - pw_log_trace_fp("%p: process %"PRIu64, this, a->awake_time); + pw_log_trace_fp("%p: %s process %"PRIu64, this, this->name, a->awake_time); /* when transport sync is not supported, just clear the flag */ if (!this->transport_sync)