mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-01 22:58:50 -04:00
Add support for trace logging in lockfree ringbuffer
Fix some crashes when the connection is dead. Small cleanups in the audio mixer Only propose alloc_buffer when we are using export_buf in v4l2
This commit is contained in:
Wim Taymans
parent
b51d3e4862
commit
214a0e27d8
10 changed files with 248 additions and 83 deletions
100
spa/lib/debug.c
100
spa/lib/debug.c
|
|
@ -18,9 +18,12 @@
|
|||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <lib/mapper.h>
|
||||
#include <spa/format-utils.h>
|
||||
#include <spa/loop.h>
|
||||
#include "debug.h"
|
||||
|
||||
SpaResult
|
||||
|
|
@ -442,6 +445,15 @@ spa_debug_dict (const SpaDict *dict)
|
|||
|
||||
#define DEFAULT_LOG_LEVEL SPA_LOG_LEVEL_INFO
|
||||
|
||||
#define TRACE_BUFFER 4096
|
||||
|
||||
typedef struct {
|
||||
SpaLog log;
|
||||
SpaRingbuffer trace_rb;
|
||||
uint8_t trace_data[TRACE_BUFFER];
|
||||
SpaSource *source;
|
||||
} DebugLog;
|
||||
|
||||
static void
|
||||
do_logv (SpaLog *log,
|
||||
SpaLogLevel level,
|
||||
|
|
@ -451,22 +463,28 @@ do_logv (SpaLog *log,
|
|||
const char *fmt,
|
||||
va_list args)
|
||||
{
|
||||
char text[16*1024], location[128];
|
||||
static const char *levels[] = {
|
||||
"-",
|
||||
"E",
|
||||
"W",
|
||||
"I",
|
||||
"D",
|
||||
"T",
|
||||
};
|
||||
DebugLog *l = SPA_CONTAINER_OF (log, DebugLog, log);
|
||||
char text[512], location[1024];
|
||||
static const char *levels[] = { "-", "E", "W", "I", "D", "T", };
|
||||
int size;
|
||||
|
||||
vsnprintf (text, sizeof(text), fmt, args);
|
||||
if (1) {
|
||||
snprintf (location, sizeof(location), "%s:%i %s()", strrchr (file, '/')+1, line, func);
|
||||
fprintf(stderr, "[%s][%s] %s\n", levels[level], location, text);
|
||||
} else {
|
||||
fprintf(stderr, "[%s] %s\n", levels[level], text);
|
||||
}
|
||||
size = snprintf (location, sizeof(location), "[%s][%s:%i %s()] %s\n",
|
||||
levels[level], strrchr (file, '/')+1, line, func, text);
|
||||
|
||||
if (SPA_UNLIKELY (level == SPA_LOG_LEVEL_TRACE) && l->source) {
|
||||
uint32_t index;
|
||||
uint64_t count = 1;
|
||||
|
||||
spa_ringbuffer_get_write_index (&l->trace_rb, &index);
|
||||
spa_ringbuffer_write_data (&l->trace_rb, l->trace_data,
|
||||
index & l->trace_rb.mask,
|
||||
location, size);
|
||||
spa_ringbuffer_write_update (&l->trace_rb, index + size);
|
||||
|
||||
write (l->source->fd, &count, sizeof(uint64_t));
|
||||
} else
|
||||
fputs (location, stderr);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -483,16 +501,54 @@ do_log (SpaLog *log,
|
|||
va_end (args);
|
||||
}
|
||||
|
||||
static SpaLog log = {
|
||||
sizeof (SpaLog),
|
||||
NULL,
|
||||
DEFAULT_LOG_LEVEL,
|
||||
do_log,
|
||||
do_logv,
|
||||
static DebugLog log = {
|
||||
{ sizeof (SpaLog),
|
||||
NULL,
|
||||
DEFAULT_LOG_LEVEL,
|
||||
do_log,
|
||||
do_logv,
|
||||
},
|
||||
{ 0, 0, TRACE_BUFFER, TRACE_BUFFER - 1 },
|
||||
};
|
||||
|
||||
SpaLog *
|
||||
spa_log_get_default (void)
|
||||
{
|
||||
return &log;
|
||||
return &log.log;
|
||||
}
|
||||
|
||||
static void
|
||||
on_trace_event (SpaSource *source)
|
||||
{
|
||||
int32_t avail;
|
||||
uint32_t index;
|
||||
uint64_t count;
|
||||
|
||||
if (read (source->fd, &count, sizeof (uint64_t)) != sizeof (uint64_t))
|
||||
fprintf (stderr, "failed to read event fd: %s", strerror (errno));
|
||||
|
||||
while ((avail = spa_ringbuffer_get_read_index (&log.trace_rb, &index)) > 0) {
|
||||
uint32_t offset, first, written;
|
||||
|
||||
if (avail > log.trace_rb.size) {
|
||||
index += avail - log.trace_rb.size;
|
||||
avail = log.trace_rb.size;
|
||||
}
|
||||
offset = index & log.trace_rb.mask;
|
||||
first = SPA_MIN (avail, log.trace_rb.size - offset);
|
||||
|
||||
written = fprintf (stderr, "%*s", first, log.trace_data + offset);
|
||||
if (SPA_UNLIKELY (avail > first)) {
|
||||
written += fprintf (stderr, "%*s", avail - first, log.trace_data + first);
|
||||
}
|
||||
spa_ringbuffer_read_update (&log.trace_rb, index + written);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
spa_log_default_set_trace_event (SpaSource *source)
|
||||
{
|
||||
log.source = source;
|
||||
log.source->func = on_trace_event;
|
||||
log.source->data = &log;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,6 +42,8 @@ SpaResult spa_debug_dump_mem (const void *data, size_t size);
|
|||
SpaResult spa_debug_dict (const SpaDict *dict);
|
||||
|
||||
SpaLog * spa_log_get_default (void);
|
||||
void spa_log_default_trace_purge (void);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
|
|
|
|||
|
|
@ -575,22 +575,24 @@ spa_audiomixer_node_port_send_command (SpaNode *node,
|
|||
return SPA_RESULT_NOT_IMPLEMENTED;
|
||||
}
|
||||
|
||||
static void
|
||||
static inline void
|
||||
add_port_data (SpaAudioMixer *this, MixerBuffer *out, SpaAudioMixerPort *port, int layer)
|
||||
{
|
||||
int i;
|
||||
int16_t *op, *ip;
|
||||
size_t os, is, chunk;
|
||||
MixerBuffer *b;
|
||||
SpaData *id, *od;
|
||||
|
||||
op = SPA_MEMBER (out->outbuf->datas[0].data, out->outbuf->datas[0].chunk->offset, void);
|
||||
os = out->outbuf->datas[0].chunk->size;
|
||||
od = out->outbuf->datas;
|
||||
op = SPA_MEMBER (od[0].data, od[0].chunk->offset, void);
|
||||
os = od[0].chunk->size;
|
||||
|
||||
b = spa_list_first (&port->queue, MixerBuffer, link);
|
||||
|
||||
ip = SPA_MEMBER (b->outbuf->datas[0].data,
|
||||
port->queued_offset + b->outbuf->datas[0].chunk->offset, void);
|
||||
is = b->outbuf->datas[0].chunk->size - port->queued_offset;
|
||||
id = b->outbuf->datas;
|
||||
ip = SPA_MEMBER (id[0].data, port->queued_offset + id[0].chunk->offset, void);
|
||||
is = id[0].chunk->size - port->queued_offset;
|
||||
|
||||
chunk = SPA_MIN (os, is);
|
||||
|
||||
|
|
@ -629,6 +631,7 @@ mix_output (SpaAudioMixer *this, size_t n_bytes)
|
|||
int i, layer;
|
||||
SpaAudioMixerPort *outport;
|
||||
SpaPortIO *output;
|
||||
SpaData *od;
|
||||
|
||||
outport = &this->out_ports[0];
|
||||
output = outport->io;
|
||||
|
|
@ -638,16 +641,16 @@ mix_output (SpaAudioMixer *this, size_t n_bytes)
|
|||
|
||||
outbuf = spa_list_first (&outport->queue, MixerBuffer, link);
|
||||
spa_list_remove (&outbuf->link);
|
||||
outbuf->outstanding = true;
|
||||
|
||||
n_bytes = SPA_MIN (n_bytes, outbuf->outbuf->datas[0].maxsize);
|
||||
od = outbuf->outbuf->datas;
|
||||
n_bytes = SPA_MIN (n_bytes, od[0].maxsize);
|
||||
od[0].chunk->offset = 0;
|
||||
od[0].chunk->size = n_bytes;
|
||||
od[0].chunk->stride = 0;
|
||||
|
||||
spa_log_trace (this->log, "audiomixer %p: dequeue output buffer %d %zd", this, outbuf->outbuf->id, n_bytes);
|
||||
|
||||
outbuf->outstanding = true;
|
||||
outbuf->outbuf->datas[0].chunk->offset = 0;
|
||||
outbuf->outbuf->datas[0].chunk->size = n_bytes;
|
||||
outbuf->outbuf->datas[0].chunk->stride = 0;
|
||||
|
||||
for (layer = 0, i = 0; i < MAX_PORTS; i++) {
|
||||
SpaAudioMixerPort *port = &this->in_ports[i];
|
||||
|
||||
|
|
@ -662,11 +665,6 @@ mix_output (SpaAudioMixer *this, size_t n_bytes)
|
|||
}
|
||||
add_port_data (this, outbuf, port, layer++);
|
||||
}
|
||||
if (layer == 0) {
|
||||
this->state = STATE_IN;
|
||||
return SPA_RESULT_NEED_INPUT;
|
||||
}
|
||||
|
||||
output->buffer_id = outbuf->outbuf->id;
|
||||
output->status = SPA_RESULT_HAVE_OUTPUT;
|
||||
this->state = STATE_OUT;
|
||||
|
|
@ -747,10 +745,8 @@ spa_audiomixer_node_process_output (SpaNode *node)
|
|||
this = SPA_CONTAINER_OF (node, SpaAudioMixer, node);
|
||||
|
||||
port = &this->out_ports[0];
|
||||
spa_return_val_if_fail (port->io != NULL, SPA_RESULT_ERROR);
|
||||
output = port->io;
|
||||
|
||||
spa_return_val_if_fail (port->n_buffers > 0, SPA_RESULT_NO_BUFFERS);
|
||||
spa_return_val_if_fail (output != NULL, SPA_RESULT_ERROR);
|
||||
|
||||
/* recycle */
|
||||
if (output->buffer_id != SPA_ID_INVALID) {
|
||||
|
|
|
|||
|
|
@ -897,7 +897,7 @@ spa_v4l2_set_format (SpaV4l2Source *this, SpaVideoInfo *format, bool try_only)
|
|||
framerate->denom = streamparm.parm.capture.timeperframe.numerator;
|
||||
|
||||
state->fmt = fmt;
|
||||
state->info.flags = SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS |
|
||||
state->info.flags = (state->export_buf ? SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS : 0) |
|
||||
SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS |
|
||||
SPA_PORT_INFO_FLAG_LIVE;
|
||||
state->info.maxbuffering = -1;
|
||||
|
|
@ -1052,7 +1052,7 @@ spa_v4l2_use_buffers (SpaV4l2Source *this, SpaBuffer **buffers, uint32_t n_buffe
|
|||
|
||||
if (buffers[i]->n_datas < 1) {
|
||||
spa_log_error (state->log, "v4l2: invalid memory on buffer %p", buffers[i]);
|
||||
continue;
|
||||
return SPA_RESULT_ERROR;
|
||||
}
|
||||
d = buffers[i]->datas;
|
||||
|
||||
|
|
@ -1243,6 +1243,8 @@ spa_v4l2_stream_off (SpaV4l2Source *this)
|
|||
if (!state->started)
|
||||
return SPA_RESULT_OK;
|
||||
|
||||
spa_v4l2_port_set_enabled (this, false);
|
||||
|
||||
type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
|
||||
if (xioctl (state->fd, VIDIOC_STREAMOFF, &type) < 0) {
|
||||
spa_log_error (this->log, "VIDIOC_STREAMOFF: %s", strerror (errno));
|
||||
|
|
|
|||
|
|
@ -123,8 +123,10 @@ typedef struct {
|
|||
unsigned int n_fds;
|
||||
} AppData;
|
||||
|
||||
#define BUFFER_SIZE1 4092
|
||||
#define BUFFER_SIZE2 4096
|
||||
#define MIN_LATENCY 64
|
||||
|
||||
#define BUFFER_SIZE1 MIN_LATENCY
|
||||
#define BUFFER_SIZE2 MIN_LATENCY - 4
|
||||
|
||||
static void
|
||||
init_buffer (AppData *data, SpaBuffer **bufs, Buffer *ba, int n_buffers, size_t size)
|
||||
|
|
@ -297,7 +299,7 @@ do_invoke (SpaLoop *loop,
|
|||
}
|
||||
|
||||
static SpaResult
|
||||
make_nodes (AppData *data)
|
||||
make_nodes (AppData *data, const char *device)
|
||||
{
|
||||
SpaResult res;
|
||||
SpaProps *props;
|
||||
|
|
@ -315,8 +317,8 @@ make_nodes (AppData *data)
|
|||
|
||||
spa_pod_builder_init (&b, buffer, sizeof (buffer));
|
||||
spa_pod_builder_props (&b, &f[0], data->type.props,
|
||||
SPA_POD_PROP (&f[1], data->type.props_device, 0, SPA_POD_TYPE_STRING, 1, "hw:1"),
|
||||
SPA_POD_PROP (&f[1], data->type.props_min_latency, 0, SPA_POD_TYPE_INT, 1, 128));
|
||||
SPA_POD_PROP (&f[1], data->type.props_device, 0, SPA_POD_TYPE_STRING, 1, device ? device : "hw:0"),
|
||||
SPA_POD_PROP (&f[1], data->type.props_min_latency, 0, SPA_POD_TYPE_INT, 1, MIN_LATENCY));
|
||||
props = SPA_POD_BUILDER_DEREF (&b, f[0].ref, SpaProps);
|
||||
|
||||
if ((res = spa_node_set_props (data->sink, props)) < 0)
|
||||
|
|
@ -583,7 +585,7 @@ main (int argc, char *argv[])
|
|||
|
||||
init_type (&data.type, data.map);
|
||||
|
||||
if ((res = make_nodes (&data)) < 0) {
|
||||
if ((res = make_nodes (&data, argc > 1 ? argv[1] : NULL)) < 0) {
|
||||
printf ("can't make nodes: %d\n", res);
|
||||
return -1;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue