diff options
| author | Ahmed S. Darwish <darwish.07@gmail.com> | 2016-03-13 00:48:15 +0200 |
|---|---|---|
| committer | David Henningsson <david.henningsson@canonical.com> | 2016-04-02 05:35:02 +0200 |
| commit | 1f5e72264ea3ccc23aa34460874c8581909d0e89 (patch) | |
| tree | 35ee7c9b8c1dabeeb084c5e0fd2b6011ffe86549 | |
| parent | 0f48b7c82378c32194b625d1fd886eee7f1e5928 (diff) | |
| download | pulseaudio-1f5e72264ea3ccc23aa34460874c8581909d0e89.tar.gz | |
pulsecore: Cache daemon shm size inside pa_core
The daemon `shm-size-bytes' configuration value was read, and then
directly used, for creating the initial server-wide SHM files.
This is fine for now, but soon, such server-wide SHMs will be replaced
with per-client SHM files that will be dynamically created and deleted
according to clients open and close. Thus, appropriately cache this
configuration value.
Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
| -rw-r--r-- | src/pulsecore/core.c | 1 | ||||
| -rw-r--r-- | src/pulsecore/core.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c index 43fd30e50..b2df7de47 100644 --- a/src/pulsecore/core.c +++ b/src/pulsecore/core.c @@ -123,6 +123,7 @@ pa_core* pa_core_new(pa_mainloop_api *m, bool shared, size_t shm_size) { c->subscription_event_last = NULL; c->mempool = pool; + c->shm_size = shm_size; pa_silence_cache_init(&c->silence_cache); if (shared && !(c->rw_mempool = pa_mempool_new(shared, shm_size))) diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h index aefc1eb65..428689c53 100644 --- a/src/pulsecore/core.h +++ b/src/pulsecore/core.h @@ -181,6 +181,11 @@ struct pa_core { The rw_mempool is used for data writable by both server and client (and can be NULL in some cases). */ pa_mempool *mempool, *rw_mempool; + + /* Shared memory size, as specified either by daemon configuration + * or PA daemon defaults (~ 64 MiB). */ + size_t shm_size; + pa_silence_cache silence_cache; pa_time_event *exit_event; |