mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

profiler: Fix crash with many streams

Browse source 
Write the profiler data to an allocated buffer instead of the stack
so that we can make it a little larger.

Don't try to process the data when the builder had to truncate it
because it didn't fit.
This commit is contained in:
Wim Taymans 2021-06-18 15:42:14 +02:00
parent 4518eded5b
commit 05c633a4f5
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/module-profiler.c
View file

@ -43,6 +43,7 @@
#define NAME "profiler" #define NAME "profiler"
#define TMP_BUFFER (16 * 1024)
#define MAX_BUFFER (8 * 1024 * 1024) #define MAX_BUFFER (8 * 1024 * 1024)
#define MIN_FLUSH (16 * 1024) #define MIN_FLUSH (16 * 1024)
#define DEFAULT_IDLE 5 #define DEFAULT_IDLE 5
@ -79,6 +80,7 @@ struct impl {
unsigned int listening:1; unsigned int listening:1;
struct spa_ringbuffer buffer; struct spa_ringbuffer buffer;
uint8_t tmp[TMP_BUFFER];
uint8_t data[MAX_BUFFER]; uint8_t data[MAX_BUFFER];
uint8_t flush[MAX_BUFFER + sizeof(struct spa_pod_struct)]; uint8_t flush[MAX_BUFFER + sizeof(struct spa_pod_struct)];
@ -154,7 +156,6 @@ static void flush_timeout(void *data, uint64_t expirations)
static void context_do_profile(void *data, struct pw_impl_node *node) static void context_do_profile(void *data, struct pw_impl_node *node)
{ {
struct impl *impl = data; struct impl *impl = data;
char buffer[4096];
struct spa_pod_builder b; struct spa_pod_builder b;
struct spa_pod_frame f[2]; struct spa_pod_frame f[2];
struct pw_node_activation *a = node->rt.activation; struct pw_node_activation *a = node->rt.activation;
@ -166,7 +167,7 @@ static void context_do_profile(void *data, struct pw_impl_node *node)
if (SPA_FLAG_IS_SET(pos->clock.flags, SPA_IO_CLOCK_FLAG_FREEWHEEL)) if (SPA_FLAG_IS_SET(pos->clock.flags, SPA_IO_CLOCK_FLAG_FREEWHEEL))
return; return;
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_builder_init(&b, impl->tmp, sizeof(impl->tmp));
spa_pod_builder_push_object(&b, &f[0], spa_pod_builder_push_object(&b, &f[0],
SPA_TYPE_OBJECT_Profiler, 0); SPA_TYPE_OBJECT_Profiler, 0);
@ -224,6 +225,9 @@ static void context_do_profile(void *data, struct pw_impl_node *node)
} }
spa_pod_builder_pop(&b, &f[0]); spa_pod_builder_pop(&b, &f[0]);
if (b.state.offset > sizeof(impl->tmp))
goto done;
filled = spa_ringbuffer_get_write_index(&impl->buffer, &idx); filled = spa_ringbuffer_get_write_index(&impl->buffer, &idx);
if (filled < 0 || filled > MAX_BUFFER) { if (filled < 0 || filled > MAX_BUFFER) {
pw_log_warn(NAME " %p: queue xrun %d", impl, filled); pw_log_warn(NAME " %p: queue xrun %d", impl, filled);