Unloading modules in the reverse order is the "more logical" thing to do, and speeds up shutdown somewhat, e g by not loading module-null-sink at shutdown. Signed-off-by: David Henningsson <david.henningsson at canonical.com> --- src/pulsecore/module.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/pulsecore/module.c b/src/pulsecore/module.c index bf554af..cdfec57 100644 --- a/src/pulsecore/module.c +++ b/src/pulsecore/module.c @@ -204,8 +204,28 @@ void pa_module_unload_by_index(pa_core *c, uint32_t idx, pa_bool_t force) { void pa_module_unload_all(pa_core *c) { pa_module *m; + uint32_t *indices; + uint32_t state; + int i; + pa_assert(c); + pa_assert(c->modules); + + /* Unload modules in reverse order by default */ + indices = pa_xnew(uint32_t, pa_idxset_size(c->modules)); + i = 0; + PA_IDXSET_FOREACH(m, c->modules, state) + indices[i++] = state; + pa_assert(i == (int) pa_idxset_size(c->modules)); + i--; + for (; i >= 0; i--) { + m = pa_idxset_remove_by_index(c->modules, indices[i]); + if (m) + pa_module_free(m); + } + pa_xfree(indices); + /* Just in case module unloading caused more modules to load */ while ((m = pa_idxset_steal_first(c->modules, NULL))) pa_module_free(m); -- 1.7.9.5