mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-23 06:59:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve debug

Browse source 
Improve log so that debug level 3 gives a reasonably readable overview
of what is going on.
This commit is contained in:
Wim Taymans 2020-04-22 12:47:18 +02:00
parent 8ab67c5fa0
commit aafd1e7298
33 changed files with 141 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

28
spa/plugins/alsa/alsa-pcm-device.c
View file

@ -227,16 +227,16 @@ static int set_profile(struct impl *this, uint32_t id)
snd_ctl_t *ctl_hndl;
int err;
spa_log_info(this->log, "open card %s", this->props.device);
if ((err = snd_ctl_open(&ctl_hndl, this->props.device, 0)) < 0) {
spa_log_error(this->log, "can't open control for card %s: %s",
this->props.device, snd_strerror(err));
return err;
}
spa_log_debug(this->log, "open card %s", this->props.device);
if ((err = snd_ctl_open(&ctl_hndl, this->props.device, 0)) < 0) {
spa_log_error(this->log, "can't open control for card %s: %s",
this->props.device, snd_strerror(err));
return err;
}
err = activate_profile(this, ctl_hndl, id);
spa_log_info(this->log, "close card %s", this->props.device);
spa_log_debug(this->log, "close card %s", this->props.device);
snd_ctl_close(ctl_hndl);
return err;
@ -253,12 +253,12 @@ static int emit_info(struct impl *this, bool full)
struct spa_param_info params[2];
char path[128];
spa_log_info(this->log, "open card %s", this->props.device);
if ((err = snd_ctl_open(&ctl_hndl, this->props.device, 0)) < 0) {
spa_log_error(this->log, "can't open control for card %s: %s",
this->props.device, snd_strerror(err));
return err;
}
spa_log_debug(this->log, "open card %s", this->props.device);
if ((err = snd_ctl_open(&ctl_hndl, this->props.device, 0)) < 0) {
spa_log_error(this->log, "can't open control for card %s: %s",
this->props.device, snd_strerror(err));
return err;
}
snd_ctl_card_info_alloca(&info);
if ((err = snd_ctl_card_info(ctl_hndl, info)) < 0) {
@ -294,7 +294,7 @@ static int emit_info(struct impl *this, bool full)
spa_device_emit_info(&this->hooks, &dinfo);
exit:
spa_log_info(this->log, "close card %s", this->props.device);
spa_log_debug(this->log, "close card %s", this->props.device);
snd_ctl_close(ctl_hndl);
return err;
}

13
spa/plugins/alsa/alsa-pcm.c
View file

@ -28,7 +28,7 @@ static int spa_alsa_open(struct state *state)
CHECK(snd_output_stdio_attach(&state->output, stderr, 0), "attach failed");
spa_log_info(state->log, NAME" %p: ALSA device open '%s' %s", state, props->device,
spa_log_debug(state->log, NAME" %p: ALSA device open '%s' %s", state, props->device,
state->stream == SND_PCM_STREAM_CAPTURE ? "capture" : "playback");
CHECK(snd_pcm_open(&state->hndl,
props->device,
@ -71,7 +71,7 @@ int spa_alsa_close(struct state *state)
if (!state->opened)
return 0;
spa_log_info(state->log, NAME" %p: Device '%s' closing", state, state->props.device);
spa_log_debug(state->log, NAME" %p: Device '%s' closing", state, state->props.device);
CHECK(snd_pcm_close(state->hndl), "close failed");
spa_system_close(state->data_system, state->timerfd);
@ -429,7 +429,7 @@ int spa_alsa_set_format(struct state *state, struct spa_audio_info *fmt, uint32_
return -EINVAL;
}
spa_log_info(state->log, NAME" %p: Stream parameters are %iHz, %s, %i channels",
spa_log_debug(state->log, NAME" %p: Stream parameters are %iHz, %s, %i channels",
state, info->rate, snd_pcm_format_name(format), info->channels);
CHECK(snd_pcm_hw_params_set_format(hndl, params, format), "set_format");
@ -470,9 +470,10 @@ int spa_alsa_set_format(struct state *state, struct spa_audio_info *fmt, uint32_
state->period_frames = period_size;
periods = state->buffer_frames / state->period_frames;
spa_log_info(state->log, NAME" %p: buffer frames %lu, period frames %lu, periods %u, frame_size %zd",
state, state->buffer_frames, state->period_frames,
periods, state->frame_size);
spa_log_info(state->log, NAME" %p: format:%s rate:%d channels:%d "
"buffer frames %lu, period frames %lu, periods %u, frame_size %zd",
state, snd_pcm_format_name(state->format), state->rate, state->channels,
state->buffer_frames, state->period_frames, periods, state->frame_size);
/* write the parameters to device */
CHECK(snd_pcm_hw_params(hndl, params), "set_hw_params");

7
spa/plugins/alsa/alsa-seq.c
View file

@ -50,7 +50,7 @@ static int seq_open(struct seq_state *state, struct seq_conn *conn)
snd_seq_port_info_t *pinfo;
int res;
spa_log_info(state->log, "%p: ALSA seq open '%s' duplex", state, props->device);
spa_log_debug(state->log, "%p: ALSA seq open '%s' duplex", state, props->device);
if ((res = snd_seq_open(&conn->hndl,
props->device,
@ -111,7 +111,7 @@ error_exit_close:
static int seq_close(struct seq_state *state, struct seq_conn *conn)
{
int res;
spa_log_info(state->log, "%p: Device '%s' closing", state, state->props.device);
spa_log_debug(state->log, "%p: Device '%s' closing", state, state->props.device);
if ((res = snd_seq_close(conn->hndl)) < 0) {
spa_log_warn(state->log, "close failed: %s", snd_strerror(res));
}
@ -407,13 +407,14 @@ int spa_alsa_seq_activate_port(struct seq_state *state, struct seq_port *port, b
port->addr.client, port->addr.port, snd_strerror(res));
active = false;
}
spa_log_info(state->log, "subscribe: %d.%d", port->addr.client, port->addr.port);
} else {
if ((res = snd_seq_unsubscribe_port(state->event.hndl, sub)) < 0) {
spa_log_warn(state->log, "can't unsubscribe from %d:%d - %s",
port->addr.client, port->addr.port, snd_strerror(res));
}
spa_log_info(state->log, "unsubscribe: %d.%d", port->addr.client, port->addr.port);
}
spa_log_info(state->log, "activate: %d.%d: %d", port->addr.client, port->addr.port, active);
port->active = active;
return res;
}

4
spa/plugins/alsa/alsa-udev.c
View file

@ -199,7 +199,7 @@ static int emit_object_info(struct impl *this, uint32_t id, struct udev_device *
snprintf(path, sizeof(path), "hw:%d", atoi(str));
spa_log_info(this->log, "open card %s", path);
spa_log_debug(this->log, "open card %s", path);
if ((res = snd_ctl_open(&ctl_hndl, path, 0)) < 0) {
spa_log_error(this->log, "can't open control for card %s: %s",
@ -210,7 +210,7 @@ static int emit_object_info(struct impl *this, uint32_t id, struct udev_device *
pcm = -1;
res = snd_ctl_pcm_next_device(ctl_hndl, &pcm);
spa_log_info(this->log, "close card %s", path);
spa_log_debug(this->log, "close card %s", path);
snd_ctl_close(ctl_hndl);
if (res < 0) {

2
spa/plugins/audioconvert/fmtconvert.c
View file

@ -605,7 +605,7 @@ static int port_set_format(void *object,
return -EINVAL;
if (other->have_format) {
spa_log_info(this->log, NAME "%p: channels:%d<>%d rate:%d<>%d format:%d<>%d", this,
spa_log_debug(this->log, NAME "%p: channels:%d<>%d rate:%d<>%d format:%d<>%d", this,
info.info.raw.channels, other->format.info.raw.channels,
info.info.raw.rate, other->format.info.raw.rate,
info.info.raw.format, other->format.info.raw.format);

10
spa/plugins/audiomixer/audiomixer.c
View file

@ -260,7 +260,7 @@ static int impl_node_add_port(void *object, enum spa_direction direction, uint32
if (this->last_port <= port_id)
this->last_port = port_id + 1;
spa_log_info(this->log, NAME " %p: add port %d", this, port_id);
spa_log_debug(this->log, NAME " %p: add port %d", this, port_id);
emit_port_info(this, port, true);
return 0;
@ -293,7 +293,7 @@ impl_node_remove_port(void *object, enum spa_direction direction, uint32_t port_
this->last_port = i + 1;
}
spa_log_info(this->log, NAME " %p: remove port %d", this, port_id);
spa_log_debug(this->log, NAME " %p: remove port %d", this, port_id);
spa_node_emit_port_info(&this->hooks, direction, port_id, NULL);
return 0;
@ -437,7 +437,7 @@ impl_node_port_enum_params(void *object, int seq,
static int clear_buffers(struct impl *this, struct port *port)
{
if (port->n_buffers > 0) {
spa_log_info(this->log, NAME " %p: clear buffers %p", this, port);
spa_log_debug(this->log, NAME " %p: clear buffers %p", this, port);
port->n_buffers = 0;
spa_list_init(&port->queue);
}
@ -493,7 +493,7 @@ static int port_set_format(void *object,
if (!port->have_format) {
this->n_formats++;
port->have_format = true;
spa_log_info(this->log, NAME " %p: set format on port %d", this, port_id);
spa_log_debug(this->log, NAME " %p: set format on port %d", this, port_id);
}
}
port->info.change_mask |= SPA_PORT_CHANGE_MASK_PARAMS;
@ -547,7 +547,7 @@ impl_node_port_use_buffers(void *object,
spa_return_val_if_fail(port->have_format, -EIO);
spa_log_info(this->log, NAME " %p: use buffers %d on port %d", this, n_buffers, port_id);
spa_log_debug(this->log, NAME " %p: use buffers %d on port %d", this, n_buffers, port_id);
clear_buffers(this, port);

4
spa/plugins/bluez5/a2dp-sink.c
View file

@ -1167,7 +1167,7 @@ static int port_set_format(struct impl *this, struct port *port,
int err;
if (format == NULL) {
spa_log_info(this->log, "clear format");
spa_log_debug(this->log, "clear format");
clear_buffers(this, port);
port->have_format = false;
} else {
@ -1245,7 +1245,7 @@ impl_node_port_use_buffers(void *object,
spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
port = &this->port;
spa_log_info(this->log, "use buffers %d", n_buffers);
spa_log_debug(this->log, "use buffers %d", n_buffers);
if (!port->have_format)
return -EIO;

4
spa/plugins/bluez5/a2dp-source.c
View file

@ -811,7 +811,7 @@ static int port_set_format(struct impl *this, struct port *port,
int err;
if (format == NULL) {
spa_log_info(this->log, "clear format");
spa_log_debug(this->log, "clear format");
clear_buffers(this, port);
port->have_format = false;
} else {
@ -890,7 +890,7 @@ impl_node_port_use_buffers(void *object,
spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
port = &this->port;
spa_log_info(this->log, "use buffers %d", n_buffers);
spa_log_debug(this->log, "use buffers %d", n_buffers);
if (!port->have_format)
return -EIO;

6
spa/plugins/bluez5/bluez5-dbus.c
View file

@ -1449,7 +1449,7 @@ static int sco_do_accept(struct spa_bt_transport *t)
memset(&addr, 0, sizeof(addr));
optlen = sizeof(addr);
spa_log_info(monitor->log, "transport %p: doing accept", t);
spa_log_debug(monitor->log, "transport %p: doing accept", t);
sock = accept(td->sco.fd, (struct sockaddr *) &addr, &optlen);
if (sock < 0) {
if (errno != EAGAIN)
@ -1505,7 +1505,7 @@ static int sco_do_connect(struct spa_bt_transport *t)
addr.sco_family = AF_BLUETOOTH;
bacpy(&addr.sco_bdaddr, &dst);
spa_log_info(monitor->log, "transport %p: doing connect", t);
spa_log_debug(monitor->log, "transport %p: doing connect", t);
err = connect(sock, (struct sockaddr *) &addr, len);
if (err < 0 && !(errno == EAGAIN || errno == EINPROGRESS)) {
spa_log_error(monitor->log, "connect(): %s", strerror(errno));
@ -1621,7 +1621,7 @@ static int sco_listen(struct spa_bt_transport *t)
goto fail_close;
}
spa_log_info(monitor->log, "transport %p: doing listen", t);
spa_log_debug(monitor->log, "transport %p: doing listen", t);
if (listen(sock, 1) < 0) {
spa_log_error(monitor->log, "listen(): %m");
goto fail_close;

4
spa/plugins/bluez5/sco-sink.c
View file

@ -841,7 +841,7 @@ static int port_set_format(struct impl *this, struct port *port,
int err;
if (format == NULL) {
spa_log_info(this->log, "clear format");
spa_log_debug(this->log, "clear format");
clear_buffers(this, port);
port->have_format = false;
} else {
@ -919,7 +919,7 @@ impl_node_port_use_buffers(void *object,
spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
port = &this->port;
spa_log_info(this->log, "use buffers %d", n_buffers);
spa_log_debug(this->log, "use buffers %d", n_buffers);
if (!port->have_format)
return -EIO;

4
spa/plugins/bluez5/sco-source.c
View file

@ -738,7 +738,7 @@ static int port_set_format(struct impl *this, struct port *port,
int err;
if (format == NULL) {
spa_log_info(this->log, "clear format");
spa_log_debug(this->log, "clear format");
clear_buffers(this, port);
port->have_format = false;
} else {
@ -817,7 +817,7 @@ impl_node_port_use_buffers(void *object,
spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL);
port = &this->port;
spa_log_info(this->log, "use buffers %d", n_buffers);
spa_log_debug(this->log, "use buffers %d", n_buffers);
if (!port->have_format)
return -EIO;

4
spa/plugins/jack/jack-sink.c
View file

@ -599,7 +599,7 @@ impl_node_port_enum_params(void *object, int seq,
static int clear_buffers(struct impl *this, struct port *port)
{
if (port->n_buffers > 0) {
spa_log_info(this->log, NAME " %p: clear buffers", this);
spa_log_debug(this->log, NAME " %p: clear buffers", this);
port->n_buffers = 0;
this->started = false;
}
@ -876,8 +876,6 @@ impl_init(const struct spa_handle_factory *factory,
init_ports(this);
spa_log_info(this->log, NAME " %p: initialized", this);
return 0;
}

4
spa/plugins/jack/jack-source.c
View file

@ -598,7 +598,7 @@ impl_node_port_enum_params(void *object, int seq,
static int clear_buffers(struct impl *this, struct port *port)
{
if (port->n_buffers > 0) {
spa_log_info(this->log, NAME " %p: clear buffers", this);
spa_log_debug(this->log, NAME " %p: clear buffers", this);
port->n_buffers = 0;
spa_list_init(&port->empty);
this->started = false;
@ -898,8 +898,6 @@ impl_init(const struct spa_handle_factory *factory,
init_ports(this);
spa_log_info(this->log, NAME " %p: initialized", this);
return 0;
}

4
spa/plugins/test/fakesink.c
View file

@ -512,7 +512,7 @@ impl_node_port_enum_params(void *object, int seq,
static int clear_buffers(struct impl *this, struct port *port)
{
if (port->n_buffers > 0) {
spa_log_info(this->log, NAME " %p: clear buffers", this);
spa_log_debug(this->log, NAME " %p: clear buffers", this);
port->n_buffers = 0;
spa_list_init(&port->ready);
this->started = false;
@ -788,8 +788,6 @@ impl_init(const struct spa_handle_factory *factory,
spa_list_init(&port->ready);
spa_log_info(this->log, NAME " %p: initialized", this);
return 0;
}

4
spa/plugins/test/fakesrc.c
View file

@ -528,7 +528,7 @@ impl_node_port_enum_params(void *object, int seq,
static int clear_buffers(struct impl *this, struct port *port)
{
if (port->n_buffers > 0) {
spa_log_info(this->log, NAME " %p: clear buffers", this);
spa_log_debug(this->log, NAME " %p: clear buffers", this);
port->n_buffers = 0;
spa_list_init(&port->empty);
this->started = false;
@ -820,8 +820,6 @@ impl_init(const struct spa_handle_factory *factory,
spa_list_init(&port->empty);
spa_log_info(this->log, NAME " %p: initialized", this);
return 0;
}

16
spa/plugins/v4l2/v4l2-utils.c
View file

@ -57,7 +57,7 @@ int spa_v4l2_open(struct spa_v4l2_device *dev, const char *path)
return -EIO;
}
spa_log_info(dev->log, "v4l2: Playback device is '%s'", path);
spa_log_debug(dev->log, "v4l2: Playback device is '%s'", path);
if (stat(path, &st) < 0) {
err = errno;
@ -111,7 +111,7 @@ int spa_v4l2_close(struct spa_v4l2_device *dev)
if (dev->active || dev->have_format)
return 0;
spa_log_info(dev->log, "v4l2: close");
spa_log_debug(dev->log, "v4l2: close");
if (close(dev->fd))
spa_log_warn(dev->log, "close: %m");
@ -159,7 +159,7 @@ static int spa_v4l2_clear_buffers(struct impl *this)
d = b->outbuf->datas;
if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_OUTSTANDING)) {
spa_log_info(this->log, "v4l2: queueing outstanding buffer %p", b);
spa_log_debug(this->log, "v4l2: queueing outstanding buffer %p", b);
spa_v4l2_buffer_recycle(this, i);
}
if (SPA_FLAG_IS_SET(b->flags, BUFFER_FLAG_MAPPED)) {
@ -881,7 +881,7 @@ static int spa_v4l2_set_format(struct impl *this, struct spa_video_info *format,
streamparm.parm.capture.timeperframe.numerator = framerate->denom;
streamparm.parm.capture.timeperframe.denominator = framerate->num;
spa_log_info(this->log, "v4l2: set %.4s %dx%d %d/%d", (char *)&fmt.fmt.pix.pixelformat,
spa_log_debug(this->log, "v4l2: set %.4s %dx%d %d/%d", (char *)&fmt.fmt.pix.pixelformat,
fmt.fmt.pix.width, fmt.fmt.pix.height,
streamparm.parm.capture.timeperframe.denominator,
streamparm.parm.capture.timeperframe.numerator);
@ -1286,7 +1286,7 @@ static int spa_v4l2_use_buffers(struct impl *this, struct spa_buffer **buffers,
spa_log_error(this->log, "v4l2: VIDIOC_REQBUFS %m");
return -errno;
}
spa_log_info(this->log, "v4l2: got %d buffers", reqbuf.count);
spa_log_debug(this->log, "v4l2: got %d buffers", reqbuf.count);
if (reqbuf.count < n_buffers) {
spa_log_error(this->log, "v4l2: can't allocate enough buffers");
return -ENOMEM;
@ -1301,7 +1301,7 @@ static int spa_v4l2_use_buffers(struct impl *this, struct spa_buffer **buffers,
b->flags = BUFFER_FLAG_OUTSTANDING;
b->h = spa_buffer_find_meta_data(buffers[i], SPA_META_Header, sizeof(*b->h));
spa_log_info(this->log, "v4l2: import buffer %p", buffers[i]);
spa_log_debug(this->log, "v4l2: import buffer %p", buffers[i]);
if (buffers[i]->n_datas < 1) {
spa_log_error(this->log, "v4l2: invalid memory on buffer %p", buffers[i]);
@ -1369,7 +1369,7 @@ mmap_init(struct impl *this,
return -errno;
}
spa_log_info(this->log, "v4l2: got %d buffers", reqbuf.count);
spa_log_debug(this->log, "v4l2: got %d buffers", reqbuf.count);
n_buffers = reqbuf.count;
if (reqbuf.count < 2) {
@ -1377,7 +1377,7 @@ mmap_init(struct impl *this,
return -ENOMEM;
}
if (port->export_buf)
spa_log_info(this->log, "v4l2: using EXPBUF");
spa_log_debug(this->log, "v4l2: using EXPBUF");
for (i = 0; i < reqbuf.count; i++) {
struct buffer *b;

4
spa/plugins/videotestsrc/videotestsrc.c
View file

@ -602,7 +602,7 @@ impl_node_port_enum_params(void *object, int seq,
static int clear_buffers(struct impl *this, struct port *port)
{
if (port->n_buffers > 0) {
spa_log_info(this->log, NAME " %p: clear buffers", this);
spa_log_debug(this->log, NAME " %p: clear buffers", this);
port->n_buffers = 0;
spa_list_init(&port->empty);
this->started = false;
@ -928,8 +928,6 @@ impl_init(const struct spa_handle_factory *factory,
port->info.n_params = 5;
spa_list_init(&port->empty);
spa_log_info(this->log, NAME " %p: initialized", this);
return 0;
}

2
spa/plugins/volume/volume.c
View file

@ -431,7 +431,7 @@ impl_node_port_enum_params(void *object, int seq,
static int clear_buffers(struct impl *this, struct port *port)
{
if (port->n_buffers > 0) {
spa_log_info(this->log, NAME " %p: clear buffers", this);
spa_log_debug(this->log, NAME " %p: clear buffers", this);
port->n_buffers = 0;
spa_list_init(&port->empty);
}

4
spa/plugins/vulkan/vulkan-compute-source.c
View file

@ -632,7 +632,7 @@ impl_node_port_enum_params(void *object, int seq,
static int clear_buffers(struct impl *this, struct port *port)
{
if (port->n_buffers > 0) {
spa_log_info(this->log, NAME " %p: clear buffers", this);
spa_log_debug(this->log, NAME " %p: clear buffers", this);
spa_vulkan_use_buffers(&this->state, 0, 0, NULL);
port->n_buffers = 0;
spa_list_init(&port->empty);
@ -948,8 +948,6 @@ impl_init(const struct spa_handle_factory *factory,
this->state.log = this->log;
spa_log_info(this->log, NAME " %p: initialized", this);
return 0;
}