mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module-profiler: use an event to send out data

Browse source 
Don't use a timer but use an event to trigger a flush of the collected
data. We are now using a per-driver buffer and we don't want to make
this too large so make sure we flush the data quickly.
This commit is contained in:
Wim Taymans 2023-07-20 12:01:38 +02:00
parent 8eb1d8f2ac
commit d74153a231
1 changed files with 5 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,9 +54,6 @@ PW_LOG_TOPIC(mod_topic, "mod." NAME);
#define TMP_BUFFER (16 * 1024) #define TMP_BUFFER (16 * 1024)
#define DATA_BUFFER (32 * 1024) #define DATA_BUFFER (32 * 1024)
#define FLUSH_BUFFER (8 * 1024 * 1024) #define FLUSH_BUFFER (8 * 1024 * 1024)
#define MIN_FLUSH (16 * 1024)
#define DEFAULT_IDLE 5
#define DEFAULT_INTERVAL 1
int pw_protocol_native_ext_profiler_init(struct pw_context *context); int pw_protocol_native_ext_profiler_init(struct pw_context *context);
@ -103,9 +100,7 @@ struct impl {
struct spa_list node_list; struct spa_list node_list;
uint32_t busy; uint32_t busy;
uint32_t empty; struct spa_source *flush_event;
struct spa_source *flush_timeout;
unsigned int flushing:1;
unsigned int listening:1; unsigned int listening:1;
uint8_t flush[FLUSH_BUFFER + sizeof(struct spa_pod_struct)]; uint8_t flush[FLUSH_BUFFER + sizeof(struct spa_pod_struct)];
@ -118,39 +113,7 @@ struct resource_data {
struct spa_hook resource_listener; struct spa_hook resource_listener;
}; };
static void start_flush(struct impl *impl) static void do_flush_event(void *data, uint64_t count)
{
struct timespec value, interval;
if (impl->flushing)
return;
value.tv_sec = 0;
value.tv_nsec = 1;
interval.tv_sec = DEFAULT_INTERVAL;
interval.tv_nsec = 0;
pw_loop_update_timer(impl->main_loop,
impl->flush_timeout, &value, &interval, false);
impl->flushing = true;
}
static void stop_flush(struct impl *impl)
{
struct timespec value, interval;
if (!impl->flushing)
return;
value.tv_sec = 0;
value.tv_nsec = 0;
interval.tv_sec = 0;
interval.tv_nsec = 0;
pw_loop_update_timer(impl->main_loop,
impl->flush_timeout, &value, &interval, false);
impl->flushing = false;
}
static void flush_timeout(void *data, uint64_t expirations)
{ {
struct impl *impl = data; struct impl *impl = data;
struct pw_resource *resource; struct pw_resource *resource;
@ -177,13 +140,6 @@ static void flush_timeout(void *data, uint64_t expirations)
total += avail; total += avail;
} }
} }
if (total <= 0) {
if (++impl->empty == DEFAULT_IDLE)
stop_flush(impl);
return;
} else {
impl->empty = 0;
}
*p = SPA_POD_INIT_Struct(total); *p = SPA_POD_INIT_Struct(total);
@ -300,7 +256,7 @@ static void context_do_profile(void *data)
b.data, b.state.offset); b.data, b.state.offset);
spa_ringbuffer_write_update(&n->buffer, idx + b.state.offset); spa_ringbuffer_write_update(&n->buffer, idx + b.state.offset);
start_flush(impl); pw_loop_signal_event(impl->main_loop, impl->flush_event);
done: done:
n->count++; n->count++;
} }
@ -442,7 +398,7 @@ static void module_destroy(void *data)
pw_properties_free(impl->properties); pw_properties_free(impl->properties);
pw_loop_destroy_source(impl->main_loop, impl->flush_timeout); pw_loop_destroy_source(impl->main_loop, impl->flush_event);
free(impl); free(impl);
} }
@ -457,7 +413,6 @@ static void global_destroy(void *data)
struct impl *impl = data; struct impl *impl = data;
stop_listener(impl); stop_listener(impl);
stop_flush(impl);
spa_hook_remove(&impl->global_listener); spa_hook_remove(&impl->global_listener);
impl->global = NULL; impl->global = NULL;
@ -513,7 +468,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
pw_properties_setf(impl->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64, pw_properties_setf(impl->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
pw_global_get_serial(impl->global)); pw_global_get_serial(impl->global));
impl->flush_timeout = pw_loop_add_timer(impl->main_loop, flush_timeout, impl); impl->flush_event = pw_loop_add_event(impl->main_loop, do_flush_event, impl);
pw_global_update_keys(impl->global, &impl->properties->dict, keys); pw_global_update_keys(impl->global, &impl->properties->dict, keys);