X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/d5f46e824e3f8a042e6f67dd4c3fc385545edd74..3d008961c095cf8d41d2c61d13d446c98c892136:/src/pulsecore/core.c diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c index 381a6779..f5eb8352 100644 --- a/src/pulsecore/core.c +++ b/src/pulsecore/core.c @@ -6,7 +6,7 @@ PulseAudio is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 of the License, + by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. PulseAudio is distributed in the hope that it will be useful, but @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -35,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -92,23 +94,26 @@ pa_core* pa_core_new(pa_mainloop_api *m, pa_bool_t shared, size_t shm_size) { c->state = PA_CORE_STARTUP; c->mainloop = m; + c->clients = pa_idxset_new(NULL, NULL); + c->cards = pa_idxset_new(NULL, NULL); c->sinks = pa_idxset_new(NULL, NULL); c->sources = pa_idxset_new(NULL, NULL); - c->source_outputs = pa_idxset_new(NULL, NULL); c->sink_inputs = pa_idxset_new(NULL, NULL); - c->cards = pa_idxset_new(NULL, NULL); + c->source_outputs = pa_idxset_new(NULL, NULL); + c->modules = pa_idxset_new(NULL, NULL); + c->scache = pa_idxset_new(NULL, NULL); - c->default_source_name = c->default_sink_name = NULL; + c->namereg = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func); + c->shared = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func); - c->modules = NULL; - c->namereg = NULL; - c->scache = NULL; - c->running_as_daemon = FALSE; + c->default_source = NULL; + c->default_sink = NULL; c->default_sample_spec.format = PA_SAMPLE_S16NE; c->default_sample_spec.rate = 44100; c->default_sample_spec.channels = 2; + pa_channel_map_init_extend(&c->default_channel_map, c->default_sample_spec.channels, PA_CHANNEL_MAP_DEFAULT); c->default_n_fragments = 4; c->default_fragment_size_msec = 25; @@ -127,22 +132,20 @@ pa_core* pa_core_new(pa_mainloop_api *m, pa_bool_t shared, size_t shm_size) { c->exit_idle_time = -1; c->scache_idle_time = 20; - c->flat_volumes = TRUE; - - c->resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 3; + c->flat_volumes = TRUE; c->disallow_module_loading = FALSE; c->disallow_exit = FALSE; + c->running_as_daemon = FALSE; c->realtime_scheduling = FALSE; c->realtime_priority = 5; c->disable_remixing = FALSE; c->disable_lfe_remixing = FALSE; + c->resample_method = PA_RESAMPLER_SPEEX_FLOAT_BASE + 3; for (j = 0; j < PA_CORE_HOOK_MAX; j++) pa_hook_init(&c->hooks[j], c); - pa_shared_init(c); - pa_random(&c->cookie, sizeof(c->cookie)); #ifdef SIGPIPE @@ -164,7 +167,13 @@ static void core_free(pa_object *o) { c->state = PA_CORE_SHUTDOWN; pa_module_unload_all(c); - pa_assert(!c->modules); + pa_scache_free_all(c); + + pa_assert(pa_idxset_isempty(c->scache)); + pa_idxset_free(c->scache, NULL, NULL); + + pa_assert(pa_idxset_isempty(c->modules)); + pa_idxset_free(c->modules, NULL, NULL); pa_assert(pa_idxset_isempty(c->clients)); pa_idxset_free(c->clients, NULL, NULL); @@ -184,28 +193,30 @@ static void core_free(pa_object *o) { pa_assert(pa_idxset_isempty(c->sink_inputs)); pa_idxset_free(c->sink_inputs, NULL, NULL); - pa_scache_free(c); - pa_namereg_free(c); + pa_assert(pa_hashmap_isempty(c->namereg)); + pa_hashmap_free(c->namereg, NULL, NULL); + + pa_assert(pa_hashmap_isempty(c->shared)); + pa_hashmap_free(c->shared, NULL, NULL); + pa_subscription_free_all(c); if (c->exit_event) c->mainloop->time_free(c->exit_event); - pa_xfree(c->default_source_name); - pa_xfree(c->default_sink_name); + pa_assert(!c->default_source); + pa_assert(!c->default_sink); pa_silence_cache_done(&c->silence_cache); pa_mempool_free(c->mempool); - pa_shared_cleanup(c); - for (j = 0; j < PA_CORE_HOOK_MAX; j++) pa_hook_done(&c->hooks[j]); pa_xfree(c); } -static void exit_callback(pa_mainloop_api*m, pa_time_event *e, const struct timeval *tv, void *userdata) { +static void exit_callback(pa_mainloop_api *m, pa_time_event *e, const struct timeval *t, void *userdata) { pa_core *c = userdata; pa_assert(c->exit_event == e); @@ -220,11 +231,7 @@ void pa_core_check_idle(pa_core *c) { c->exit_idle_time >= 0 && pa_idxset_size(c->clients) == 0) { - struct timeval tv; - pa_gettimeofday(&tv); - tv.tv_sec+= c->exit_idle_time; - - c->exit_event = c->mainloop->time_new(c->mainloop, &tv, exit_callback, c); + c->exit_event = pa_core_rttime_new(c, pa_rtclock_now() + c->exit_idle_time * PA_USEC_PER_SEC, exit_callback, c); } else if (c->exit_event && pa_idxset_size(c->clients) > 0) { c->mainloop->time_free(c->exit_event); @@ -241,3 +248,32 @@ int pa_core_exit(pa_core *c, pa_bool_t force, int retval) { c->mainloop->quit(c->mainloop, retval); return 0; } + +void pa_core_maybe_vacuum(pa_core *c) { + pa_assert(c); + + if (!pa_idxset_isempty(c->sink_inputs) || + !pa_idxset_isempty(c->source_outputs)) + return; + + pa_log_debug("Hmm, no streams around, trying to vacuum."); + pa_mempool_vacuum(c->mempool); +} + +pa_time_event* pa_core_rttime_new(pa_core *c, pa_usec_t usec, pa_time_event_cb_t cb, void *userdata) { + struct timeval tv; + + pa_assert(c); + pa_assert(c->mainloop); + + return c->mainloop->time_new(c->mainloop, pa_timeval_rtstore(&tv, usec, TRUE), cb, userdata); +} + +void pa_core_rttime_restart(pa_core *c, pa_time_event *e, pa_usec_t usec) { + struct timeval tv; + + pa_assert(c); + pa_assert(c->mainloop); + + c->mainloop->time_restart(e, pa_timeval_rtstore(&tv, usec, TRUE)); +}