From 9a5609de2b32dfbb8d5eadd2874d4a2d2e243cf0 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 11 Jan 2024 17:49:50 +0100 Subject: [PATCH] modules: move some spa_debug_mem to the log Instead of dumping to stderr, write it to the log file. --- src/modules/module-protocol-native.c | 3 ++- src/modules/module-protocol-pulse/message.c | 4 +--- src/modules/module-rtp-session.c | 7 ++++--- src/modules/module-rtp/audio.c | 2 +- src/modules/module-rtp/midi.c | 2 +- src/modules/module-rtp/opus.c | 2 +- src/modules/module-rtp/stream.c | 1 + src/modules/module-vban/audio.c | 2 +- src/modules/module-vban/midi.c | 2 +- src/modules/module-vban/stream.c | 1 + 10 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/modules/module-protocol-native.c b/src/modules/module-protocol-native.c index 573c6b3f4..0eaa7b846 100644 --- a/src/modules/module-protocol-native.c +++ b/src/modules/module-protocol-native.c @@ -32,6 +32,7 @@ #include #include #include +#include #ifdef HAVE_SYSTEMD #include @@ -251,7 +252,7 @@ static void debug_msg(const char *prefix, const struct pw_protocol_native_messag else hex = true; if (hex) - spa_debug_mem(0, msg->data, msg->size); + spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_DEBUG, 0, msg->data, msg->size); pw_logt_debug(mod_topic_connection, "%s ****", prefix); diff --git a/src/modules/module-protocol-pulse/message.c b/src/modules/module-protocol-pulse/message.c index 38d00d6b1..9423a676e 100644 --- a/src/modules/module-protocol-pulse/message.c +++ b/src/modules/module-protocol-pulse/message.c @@ -649,8 +649,6 @@ int message_dump(enum spa_log_level level, const char *prefix, struct message *m { int res; uint32_t i, offset = m->offset, o; - struct spa_debug_log_ctx ctx = SPA_LOGF_DEBUG_INIT(pw_log_get(), level, - PW_LOG_TOPIC_DEFAULT, __FILE__, __LINE__, __func__ ); m->offset = 0; @@ -736,7 +734,7 @@ int message_dump(enum spa_log_level level, const char *prefix, struct message *m size_t len; if ((res = read_arbitrary(m, &mem, &len)) < 0) return res; - spa_debugc_mem(&ctx.ctx, 0, mem, len); + spa_debug_log_mem(pw_log_get(), level, 0, mem, len); break; } case TAG_BOOLEAN_TRUE: diff --git a/src/modules/module-rtp-session.c b/src/modules/module-rtp-session.c index c40c1bcf6..36ccfe840 100644 --- a/src/modules/module-rtp-session.c +++ b/src/modules/module-rtp-session.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -1010,7 +1011,7 @@ on_ctrl_io(void *data, int fd, uint32_t mask) if (buffer[0] == 0xff && buffer[1] == 0xff) { parse_apple_midi_cmd(impl, true, buffer, len, &sa, salen); } else { - spa_debug_mem(0, buffer, len); + spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_DEBUG, 0, buffer, len); } } return; @@ -1020,7 +1021,7 @@ receive_error: return; short_packet: pw_log_warn("short packet received"); - spa_debug_mem(0, buffer, len); + spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_DEBUG, 0, buffer, len); return; } @@ -1065,7 +1066,7 @@ receive_error: return; short_packet: pw_log_warn("short packet received"); - spa_debug_mem(0, buffer, len); + spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_DEBUG, 0, buffer, len); return; unknown_ssrc: pw_log_debug("unknown SSRC %08x", ssrc); diff --git a/src/modules/module-rtp/audio.c b/src/modules/module-rtp/audio.c index fa2c7be2e..28ee51a39 100644 --- a/src/modules/module-rtp/audio.c +++ b/src/modules/module-rtp/audio.c @@ -181,7 +181,7 @@ short_packet: return -EINVAL; invalid_version: pw_log_warn("invalid RTP version"); - spa_debug_mem(0, buffer, len); + spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_INFO, 0, buffer, len); return -EPROTO; invalid_len: pw_log_warn("invalid RTP length"); diff --git a/src/modules/module-rtp/midi.c b/src/modules/module-rtp/midi.c index f19244a6f..c25e58576 100644 --- a/src/modules/module-rtp/midi.c +++ b/src/modules/module-rtp/midi.c @@ -315,7 +315,7 @@ short_packet: return -EINVAL; invalid_version: pw_log_warn("invalid RTP version"); - spa_debug_mem(0, buffer, len); + spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_INFO, 0, buffer, len); return -EPROTO; invalid_len: pw_log_warn("invalid RTP length"); diff --git a/src/modules/module-rtp/opus.c b/src/modules/module-rtp/opus.c index 98034b7b7..30c9643a3 100644 --- a/src/modules/module-rtp/opus.c +++ b/src/modules/module-rtp/opus.c @@ -196,7 +196,7 @@ short_packet: return -EINVAL; invalid_version: pw_log_warn("invalid RTP version"); - spa_debug_mem(0, buffer, len); + spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_INFO, 0, buffer, len); return -EPROTO; invalid_len: pw_log_warn("invalid RTP length"); diff --git a/src/modules/module-rtp/stream.c b/src/modules/module-rtp/stream.c index 40daaf2ce..1062a5be1 100644 --- a/src/modules/module-rtp/stream.c +++ b/src/modules/module-rtp/stream.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "config.h" diff --git a/src/modules/module-vban/audio.c b/src/modules/module-vban/audio.c index f3db5274f..3a65500d4 100644 --- a/src/modules/module-vban/audio.c +++ b/src/modules/module-vban/audio.c @@ -161,7 +161,7 @@ short_packet: return -EINVAL; invalid_version: pw_log_warn("invalid VBAN version"); - spa_debug_mem(0, buffer, len); + spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_INFO, 0, buffer, len); return -EPROTO; } diff --git a/src/modules/module-vban/midi.c b/src/modules/module-vban/midi.c index a304d0280..7a6882992 100644 --- a/src/modules/module-vban/midi.c +++ b/src/modules/module-vban/midi.c @@ -217,7 +217,7 @@ short_packet: return -EINVAL; invalid_version: pw_log_warn("invalid RTP version"); - spa_debug_mem(0, buffer, len); + spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_INFO, 0, buffer, len); return -EPROTO; } diff --git a/src/modules/module-vban/stream.c b/src/modules/module-vban/stream.c index eb005cbbc..88c8d910c 100644 --- a/src/modules/module-vban/stream.c +++ b/src/modules/module-vban/stream.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "config.h"