On Wed, 28 Feb 2018 17:16:03 +0100,
Tanu Kaskinen wrote:
>
> As the comments explain, this fixes relogin problems on some systems
> that remove our sockets on logout without terminating the daemon.
> ---
>
> Takashi or Rex, could you test this? I haven't done any testing.
Did a few quick tests on two versions, and works fine.
Tested-by: Takashi Iwai <tiwai at suse.de>
Thanks!
Takashi
>
> src/modules/module-console-kit.c | 13 +++++++++++++
> src/modules/module-systemd-login.c | 14 ++++++++++++++
> src/modules/x11/module-x11-xsmp.c | 13 +++++++++++++
> src/pulsecore/core.c | 10 ++++++++++
> src/pulsecore/core.h | 2 ++
> 5 files changed, 52 insertions(+)
>
> diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c
> index c79388499..c8fe2ed24 100644
> --- a/src/modules/module-console-kit.c
> +++ b/src/modules/module-console-kit.c
> @@ -118,6 +118,19 @@ static void add_session(struct userdata *u, const char *id) {
>
> pa_log_debug("Added new session %s", id);
>
> + /* Positive exit_idle_time is only useful when we have no session tracking
> + * capability, so we can set it to 0 now that we have detected a session.
> + * The benefit of setting exit_idle_time to 0 is that pulseaudio will exit
> + * immediately when the session ends. That in turn is useful, because some
> + * systems (those that use pam_systemd but don't use systemd for managing
> + * pulseaudio) clean $XDG_RUNTIME_DIR on logout, but fail to terminate all
> + * services that depend on the files in $XDG_RUNTIME_DIR. The directory
> + * contains our sockets, and if the sockets are removed without terminating
> + * pulseaudio, a quick relogin will likely cause trouble, because a new
> + * instance will be spawned while the old instance is still running. */
> + if (u->core->exit_idle_time > 0)
> + pa_core_set_exit_idle_time(u->core, 0);
> +
> fail:
>
> if (m)
> diff --git a/src/modules/module-systemd-login.c b/src/modules/module-systemd-login.c
> index 879815927..51401575a 100644
> --- a/src/modules/module-systemd-login.c
> +++ b/src/modules/module-systemd-login.c
> @@ -84,6 +84,20 @@ static int add_session(struct userdata *u, const char *id) {
> pa_hashmap_put(u->sessions, session->id, session);
>
> pa_log_debug("Added new session %s", id);
> +
> + /* Positive exit_idle_time is only useful when we have no session tracking
> + * capability, so we can set it to 0 now that we have detected a session.
> + * The benefit of setting exit_idle_time to 0 is that pulseaudio will exit
> + * immediately when the session ends. That in turn is useful, because some
> + * systems (those that use pam_systemd but don't use systemd for managing
> + * pulseaudio) clean $XDG_RUNTIME_DIR on logout, but fail to terminate all
> + * services that depend on the files in $XDG_RUNTIME_DIR. The directory
> + * contains our sockets, and if the sockets are removed without terminating
> + * pulseaudio, a quick relogin will likely cause trouble, because a new
> + * instance will be spawned while the old instance is still running. */
> + if (u->core->exit_idle_time > 0)
> + pa_core_set_exit_idle_time(u->core, 0);
> +
> return 0;
> }
>
> diff --git a/src/modules/x11/module-x11-xsmp.c b/src/modules/x11/module-x11-xsmp.c
> index 0238e5167..6f8012372 100644
> --- a/src/modules/x11/module-x11-xsmp.c
> +++ b/src/modules/x11/module-x11-xsmp.c
> @@ -206,6 +206,19 @@ int pa__init(pa_module*m) {
> if (!u->client)
> goto fail;
>
> + /* Positive exit_idle_time is only useful when we have no session tracking
> + * capability, so we can set it to 0 now that we have detected a session.
> + * The benefit of setting exit_idle_time to 0 is that pulseaudio will exit
> + * immediately when the session ends. That in turn is useful, because some
> + * systems (those that use pam_systemd but don't use systemd for managing
> + * pulseaudio) clean $XDG_RUNTIME_DIR on logout, but fail to terminate all
> + * services that depend on the files in $XDG_RUNTIME_DIR. The directory
> + * contains our sockets, and if the sockets are removed without terminating
> + * pulseaudio, a quick relogin will likely cause trouble, because a new
> + * instance will be spawned while the old instance is still running. */
> + if (u->core->exit_idle_time > 0)
> + pa_core_set_exit_idle_time(u->core, 0);
> +
> pa_modargs_free(ma);
>
> return 0;
> diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c
> index 79abbc044..da42a13e4 100644
> --- a/src/pulsecore/core.c
> +++ b/src/pulsecore/core.c
> @@ -426,6 +426,16 @@ void pa_core_update_default_source(pa_core *core) {
> pa_hook_fire(&core->hooks[PA_CORE_HOOK_DEFAULT_SOURCE_CHANGED], core->default_source);
> }
>
> +void pa_core_set_exit_idle_time(pa_core *core, int time) {
> + pa_assert(core);
> +
> + if (time == core->exit_idle_time)
> + return;
> +
> + pa_log_info("exit_idle_time: %i -> %i", core->exit_idle_time, time);
> + core->exit_idle_time = time;
> +}
> +
> 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);
> diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
> index 213964cec..38622f618 100644
> --- a/src/pulsecore/core.h
> +++ b/src/pulsecore/core.h
> @@ -258,6 +258,8 @@ void pa_core_set_configured_default_source(pa_core *core, const char *source);
> void pa_core_update_default_sink(pa_core *core);
> void pa_core_update_default_source(pa_core *core);
>
> +void pa_core_set_exit_idle_time(pa_core *core, int time);
> +
> /* Check whether no one is connected to this core */
> void pa_core_check_idle(pa_core *c);
>
> --
> 2.16.1
>
