mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

loop: rate limit xrun messages

Browse source 
When the reader thread locks up for some reason, avoid excessive
logs about the invoke queue being filled.

See #3532
This commit is contained in:
Wim Taymans 2023-09-30 09:29:20 +02:00
parent ceb4f43944
commit ee6e7021f0
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
spa/plugins/support/loop.c
View file

@ -16,6 +16,7 @@
#include <spa/support/plugin.h> #include <spa/support/plugin.h>
#include <spa/utils/list.h> #include <spa/utils/list.h>
#include <spa/utils/names.h> #include <spa/utils/names.h>
#include <spa/utils/ratelimit.h>
#include <spa/utils/result.h> #include <spa/utils/result.h>
#include <spa/utils/type.h> #include <spa/utils/type.h>
#include <spa/utils/ringbuffer.h> #include <spa/utils/ringbuffer.h>
@ -64,6 +65,7 @@ struct impl {
struct spa_source *wakeup; struct spa_source *wakeup;
int ack_fd; int ack_fd;
struct spa_ratelimit rate_limit;
struct spa_ringbuffer buffer; struct spa_ringbuffer buffer;
uint8_t *buffer_data; uint8_t *buffer_data;
@ -94,6 +96,13 @@ struct source_impl {
}; };
/** \endcond */ /** \endcond */
static inline uint64_t get_time_ns(struct spa_system *system)
{
struct timespec ts;
spa_system_clock_gettime(system, CLOCK_MONOTONIC, &ts);
return SPA_TIMESPEC_TO_NSEC(&ts);
}
static int loop_add_source(void *object, struct spa_source *source) static int loop_add_source(void *object, struct spa_source *source)
{ {
struct impl *impl = object; struct impl *impl = object;
@ -267,8 +276,12 @@ loop_invoke(void *object,
item->item_size = SPA_ROUND_UP_N(l0 + size, ITEM_ALIGN); item->item_size = SPA_ROUND_UP_N(l0 + size, ITEM_ALIGN);
} }
if (avail < item->item_size) { if (avail < item->item_size) {
spa_log_warn(impl->log, "%p: queue full %d, need %zd", impl, avail, int suppressed;
item->item_size); uint64_t nsec = get_time_ns(impl->system);
if ((suppressed = spa_ratelimit_test(&impl->rate_limit, nsec)) >= 0) {
spa_log_warn(impl->log, "%p: queue full %d, need %zd (%d suppressed)",
impl, avail, item->item_size, suppressed);
}
return -EPIPE; return -EPIPE;
} }
if (data && size > 0) if (data && size > 0)
@ -1004,6 +1017,8 @@ impl_init(const struct spa_handle_factory *factory,
res = -EINVAL; res = -EINVAL;
goto error_exit; goto error_exit;
} }
impl->rate_limit.interval = 2 * SPA_NSEC_PER_SEC;
impl->rate_limit.burst = 1;
if ((res = spa_system_pollfd_create(impl->system, SPA_FD_CLOEXEC)) < 0) { if ((res = spa_system_pollfd_create(impl->system, SPA_FD_CLOEXEC)) < 0) {
spa_log_error(impl->log, "%p: can't create pollfd: %s", spa_log_error(impl->log, "%p: can't create pollfd: %s",