mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-10-31 22:25:38 -04:00
modules: move some spa_debug_mem to the log
Instead of dumping to stderr, write it to the log file.
This commit is contained in:
parent
4b145ad444
commit
9a5609de2b
10 changed files with 14 additions and 12 deletions
|
|
@ -32,6 +32,7 @@
|
||||||
#include <spa/utils/result.h>
|
#include <spa/utils/result.h>
|
||||||
#include <spa/utils/string.h>
|
#include <spa/utils/string.h>
|
||||||
#include <spa/utils/json.h>
|
#include <spa/utils/json.h>
|
||||||
|
#include <spa/debug/log.h>
|
||||||
|
|
||||||
#ifdef HAVE_SYSTEMD
|
#ifdef HAVE_SYSTEMD
|
||||||
#include <systemd/sd-daemon.h>
|
#include <systemd/sd-daemon.h>
|
||||||
|
|
@ -251,7 +252,7 @@ static void debug_msg(const char *prefix, const struct pw_protocol_native_messag
|
||||||
else
|
else
|
||||||
hex = true;
|
hex = true;
|
||||||
if (hex)
|
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);
|
pw_logt_debug(mod_topic_connection, "%s ****", prefix);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -649,8 +649,6 @@ int message_dump(enum spa_log_level level, const char *prefix, struct message *m
|
||||||
{
|
{
|
||||||
int res;
|
int res;
|
||||||
uint32_t i, offset = m->offset, o;
|
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;
|
m->offset = 0;
|
||||||
|
|
||||||
|
|
@ -736,7 +734,7 @@ int message_dump(enum spa_log_level level, const char *prefix, struct message *m
|
||||||
size_t len;
|
size_t len;
|
||||||
if ((res = read_arbitrary(m, &mem, &len)) < 0)
|
if ((res = read_arbitrary(m, &mem, &len)) < 0)
|
||||||
return res;
|
return res;
|
||||||
spa_debugc_mem(&ctx.ctx, 0, mem, len);
|
spa_debug_log_mem(pw_log_get(), level, 0, mem, len);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case TAG_BOOLEAN_TRUE:
|
case TAG_BOOLEAN_TRUE:
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@
|
||||||
#include <spa/param/audio/format-utils.h>
|
#include <spa/param/audio/format-utils.h>
|
||||||
#include <spa/debug/types.h>
|
#include <spa/debug/types.h>
|
||||||
#include <spa/debug/mem.h>
|
#include <spa/debug/mem.h>
|
||||||
|
#include <spa/debug/log.h>
|
||||||
|
|
||||||
#include <pipewire/pipewire.h>
|
#include <pipewire/pipewire.h>
|
||||||
#include <pipewire/impl.h>
|
#include <pipewire/impl.h>
|
||||||
|
|
@ -1010,7 +1011,7 @@ on_ctrl_io(void *data, int fd, uint32_t mask)
|
||||||
if (buffer[0] == 0xff && buffer[1] == 0xff) {
|
if (buffer[0] == 0xff && buffer[1] == 0xff) {
|
||||||
parse_apple_midi_cmd(impl, true, buffer, len, &sa, salen);
|
parse_apple_midi_cmd(impl, true, buffer, len, &sa, salen);
|
||||||
} else {
|
} else {
|
||||||
spa_debug_mem(0, buffer, len);
|
spa_debug_log_mem(pw_log_get(), SPA_LOG_LEVEL_DEBUG, 0, buffer, len);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
|
@ -1020,7 +1021,7 @@ receive_error:
|
||||||
return;
|
return;
|
||||||
short_packet:
|
short_packet:
|
||||||
pw_log_warn("short packet received");
|
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;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1065,7 +1066,7 @@ receive_error:
|
||||||
return;
|
return;
|
||||||
short_packet:
|
short_packet:
|
||||||
pw_log_warn("short packet received");
|
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;
|
return;
|
||||||
unknown_ssrc:
|
unknown_ssrc:
|
||||||
pw_log_debug("unknown SSRC %08x", ssrc);
|
pw_log_debug("unknown SSRC %08x", ssrc);
|
||||||
|
|
|
||||||
|
|
@ -181,7 +181,7 @@ short_packet:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
invalid_version:
|
invalid_version:
|
||||||
pw_log_warn("invalid RTP 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;
|
return -EPROTO;
|
||||||
invalid_len:
|
invalid_len:
|
||||||
pw_log_warn("invalid RTP length");
|
pw_log_warn("invalid RTP length");
|
||||||
|
|
|
||||||
|
|
@ -315,7 +315,7 @@ short_packet:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
invalid_version:
|
invalid_version:
|
||||||
pw_log_warn("invalid RTP 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;
|
return -EPROTO;
|
||||||
invalid_len:
|
invalid_len:
|
||||||
pw_log_warn("invalid RTP length");
|
pw_log_warn("invalid RTP length");
|
||||||
|
|
|
||||||
|
|
@ -196,7 +196,7 @@ short_packet:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
invalid_version:
|
invalid_version:
|
||||||
pw_log_warn("invalid RTP 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;
|
return -EPROTO;
|
||||||
invalid_len:
|
invalid_len:
|
||||||
pw_log_warn("invalid RTP length");
|
pw_log_warn("invalid RTP length");
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@
|
||||||
#include <spa/control/control.h>
|
#include <spa/control/control.h>
|
||||||
#include <spa/debug/types.h>
|
#include <spa/debug/types.h>
|
||||||
#include <spa/debug/mem.h>
|
#include <spa/debug/mem.h>
|
||||||
|
#include <spa/debug/log.h>
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -161,7 +161,7 @@ short_packet:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
invalid_version:
|
invalid_version:
|
||||||
pw_log_warn("invalid VBAN 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;
|
return -EPROTO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -217,7 +217,7 @@ short_packet:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
invalid_version:
|
invalid_version:
|
||||||
pw_log_warn("invalid RTP 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;
|
return -EPROTO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@
|
||||||
#include <spa/control/control.h>
|
#include <spa/control/control.h>
|
||||||
#include <spa/debug/types.h>
|
#include <spa/debug/types.h>
|
||||||
#include <spa/debug/mem.h>
|
#include <spa/debug/mem.h>
|
||||||
|
#include <spa/debug/log.h>
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue