mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	suspend-on-idle: Trigger mempool vacuuming
In a setup with one or more filter sinks or sources there is always at least one stream existing. In such a situation normal mempool vacuuming never happens. This patch causes suspend-on-idle module to vacuum memory when ever it notices that all sinks and sources are suspended. The behavior can be enabled with a module parameter.
This commit is contained in:
		
							parent
							
								
									47b7ca830e
								
							
						
					
					
						commit
						ff79b3147c
					
				
					 1 changed files with 40 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -41,10 +41,13 @@ PA_MODULE_AUTHOR("Lennart Poettering");
 | 
			
		|||
PA_MODULE_DESCRIPTION("When a sink/source is idle for too long, suspend it");
 | 
			
		||||
PA_MODULE_VERSION(PACKAGE_VERSION);
 | 
			
		||||
PA_MODULE_LOAD_ONCE(TRUE);
 | 
			
		||||
PA_MODULE_USAGE("timeout=<timeout>");
 | 
			
		||||
PA_MODULE_USAGE(
 | 
			
		||||
        "timeout=<timeout> "
 | 
			
		||||
        "mempool_vacuum=<vacuum memory if all sinks and sources are suspended?>");
 | 
			
		||||
 | 
			
		||||
static const char* const valid_modargs[] = {
 | 
			
		||||
    "timeout",
 | 
			
		||||
    "mempool_vacuum",
 | 
			
		||||
    NULL,
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -71,6 +74,8 @@ struct userdata {
 | 
			
		|||
        *source_output_move_finish_slot,
 | 
			
		||||
        *sink_input_state_changed_slot,
 | 
			
		||||
        *source_output_state_changed_slot;
 | 
			
		||||
 | 
			
		||||
    pa_bool_t mempool_vacuum:1;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
struct device_info {
 | 
			
		||||
| 
						 | 
				
			
			@ -81,6 +86,29 @@ struct device_info {
 | 
			
		|||
    pa_time_event *time_event;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
static void check_meempool_vacuum(struct device_info *d) {
 | 
			
		||||
    pa_sink *si;
 | 
			
		||||
    pa_source *so;
 | 
			
		||||
    uint32_t idx;
 | 
			
		||||
 | 
			
		||||
    pa_assert(d);
 | 
			
		||||
    pa_assert(d->userdata);
 | 
			
		||||
    pa_assert(d->userdata->core);
 | 
			
		||||
 | 
			
		||||
    idx = 0;
 | 
			
		||||
    PA_IDXSET_FOREACH(si, d->userdata->core->sinks, idx)
 | 
			
		||||
        if (pa_sink_get_state(si) != PA_SINK_SUSPENDED)
 | 
			
		||||
            return;
 | 
			
		||||
 | 
			
		||||
    idx = 0;
 | 
			
		||||
    PA_IDXSET_FOREACH(so, d->userdata->core->sources, idx)
 | 
			
		||||
        if (pa_source_get_state(so) != PA_SOURCE_SUSPENDED)
 | 
			
		||||
            return;
 | 
			
		||||
 | 
			
		||||
    pa_log_info("All sinks and sources are suspended, vacuuming memory");
 | 
			
		||||
    pa_mempool_vacuum(d->userdata->core->mempool);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void timeout_cb(pa_mainloop_api*a, pa_time_event* e, const struct timeval *t, void *userdata) {
 | 
			
		||||
    struct device_info *d = userdata;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -91,11 +119,15 @@ static void timeout_cb(pa_mainloop_api*a, pa_time_event* e, const struct timeval
 | 
			
		|||
    if (d->sink && pa_sink_check_suspend(d->sink) <= 0 && !(d->sink->suspend_cause & PA_SUSPEND_IDLE)) {
 | 
			
		||||
        pa_log_info("Sink %s idle for too long, suspending ...", d->sink->name);
 | 
			
		||||
        pa_sink_suspend(d->sink, TRUE, PA_SUSPEND_IDLE);
 | 
			
		||||
        if (d->userdata->mempool_vacuum)
 | 
			
		||||
            check_meempool_vacuum(d);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (d->source && pa_source_check_suspend(d->source) <= 0 && !(d->source->suspend_cause & PA_SUSPEND_IDLE)) {
 | 
			
		||||
        pa_log_info("Source %s idle for too long, suspending ...", d->source->name);
 | 
			
		||||
        pa_source_suspend(d->source, TRUE, PA_SUSPEND_IDLE);
 | 
			
		||||
        if (d->userdata->mempool_vacuum)
 | 
			
		||||
            check_meempool_vacuum(d);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -417,6 +449,7 @@ int pa__init(pa_module*m) {
 | 
			
		|||
    pa_modargs *ma = NULL;
 | 
			
		||||
    struct userdata *u;
 | 
			
		||||
    uint32_t timeout = 5;
 | 
			
		||||
    pa_bool_t mempool_vacuum = FALSE;
 | 
			
		||||
    uint32_t idx;
 | 
			
		||||
    pa_sink *sink;
 | 
			
		||||
    pa_source *source;
 | 
			
		||||
| 
						 | 
				
			
			@ -433,10 +466,16 @@ int pa__init(pa_module*m) {
 | 
			
		|||
        goto fail;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (pa_modargs_get_value_boolean(ma, "mempool_vacuum", &mempool_vacuum) < 0) {
 | 
			
		||||
        pa_log("Failed to parse mempool_vacuum boolean parameter.");
 | 
			
		||||
        goto fail;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    m->userdata = u = pa_xnew(struct userdata, 1);
 | 
			
		||||
    u->core = m->core;
 | 
			
		||||
    u->timeout = timeout;
 | 
			
		||||
    u->device_infos = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
 | 
			
		||||
    u->mempool_vacuum = mempool_vacuum;
 | 
			
		||||
 | 
			
		||||
    for (sink = pa_idxset_first(m->core->sinks, &idx); sink; sink = pa_idxset_next(m->core->sinks, &idx))
 | 
			
		||||
        device_new_hook_cb(m->core, PA_OBJECT(sink), u);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue