From 68f6d4d6dedec4ecedecbc1f5e5fd25ff5b79abe Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 13 Feb 2023 16:56:54 +0100 Subject: [PATCH] log: improve format debug log Use the format debug log instead of generic pod log --- src/pipewire/log.c | 12 +++++++----- src/pipewire/private.h | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/pipewire/log.c b/src/pipewire/log.c index 24841098c..e902a5b41 100644 --- a/src/pipewire/log.c +++ b/src/pipewire/log.c @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -241,13 +242,14 @@ void pw_log_log_object(enum spa_log_level level, { struct spa_debug_log_ctx ctx = SPA_LOGF_DEBUG_INIT(global_log, level, topic, file, line, func ); - if (flags & PW_LOG_OBJECT_POD) { + if (object == NULL) { + pw_log_logt(level, topic, file, line, func, "NULL"); + } else { const struct spa_pod *pod = object; - if (pod == NULL) { - pw_log_logt(level, topic, file, line, func, "NULL"); - } else { + if (flags & PW_LOG_OBJECT_POD) spa_debugc_pod(&ctx.ctx, 0, SPA_TYPE_ROOT, pod); - } + else if (flags & PW_LOG_OBJECT_FORMAT) + spa_debugc_format(&ctx.ctx, 0, NULL, pod); } } diff --git a/src/pipewire/private.h b/src/pipewire/private.h index 6fa8d778f..60b0a7eca 100644 --- a/src/pipewire/private.h +++ b/src/pipewire/private.h @@ -1276,6 +1276,7 @@ void pw_control_destroy(struct pw_control *control); void pw_impl_client_unref(struct pw_impl_client *client); #define PW_LOG_OBJECT_POD (1<<0) +#define PW_LOG_OBJECT_FORMAT (1<<1) void pw_log_log_object(enum spa_log_level level, const struct spa_log_topic *topic, const char *file, int line, const char *func, uint32_t flags, const void *object); @@ -1288,7 +1289,7 @@ void pw_log_log_object(enum spa_log_level level, const struct spa_log_topic *top }) #define pw_log_pod(lev,pod) pw_log_object(lev,PW_LOG_TOPIC_DEFAULT,PW_LOG_OBJECT_POD,pod) -#define pw_log_format(lev,pod) pw_log_object(lev,PW_LOG_TOPIC_DEFAULT,PW_LOG_OBJECT_POD,pod) +#define pw_log_format(lev,pod) pw_log_object(lev,PW_LOG_TOPIC_DEFAULT,PW_LOG_OBJECT_FORMAT,pod) bool pw_log_is_default(void);