Ticket #519: 0001-pulse-add-resume-when-pulseaudio-is-killed.patch

pulse/pcm_pulse.c

@@ -269 +269 @@
 
     pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-    assert(pcm->stream);
+    if (!pcm->stream) {
+        ret = -ESTRPIPE;
+        goto finish;
+    }
 
     ret = pulse_check_connection(pcm->p);
     if (ret < 0)
@@ -309 +312 @@
 
     pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-    assert(pcm->stream);
+    if (!pcm->stream) {
+        err = -ESTRPIPE;
+        goto finish;
+    }
 
     for (;;) {
         err = pulse_check_connection(pcm->p);
@@ -358 +364 @@
 
     pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-    assert(pcm->stream);
+    if (!pcm->stream) {
+        ret = -ESTRPIPE;
+        goto finish;
+    }
 
     ret = pulse_check_connection(pcm->p);
     if (ret < 0)
@@ -413 +422 @@
 
     pa_threaded_mainloop_lock(pcm->p->mainloop);
 
-    assert(pcm->stream);
+    if (!pcm->stream) {
+        ret = -ESTRPIPE;
+        goto finish;
+    }
 
     ret = pulse_check_connection(pcm->p);
     if (ret < 0)
@@ -553 +565 @@
         pcm->stream = NULL;
     }
 
-    err = pulse_check_connection(pcm->p);
+    err = pulse_check_connection_reconnect(pcm->p);
     if (err < 0)
         goto finish;
 
@@ -638 +650 @@
     return err;
 }
 
+static int pulse_resume(snd_pcm_ioplug_t * io)
+{
+    int ret = 0;
+    snd_pcm_pulse_t *pcm = io->private_data;
+
+    assert(pcm);
+    assert(pcm->p);
+
+    pa_threaded_mainloop_lock(pcm->p->mainloop);
+
+    if (!pcm->stream) {
+        ret = pulse_check_connection_reconnect(pcm->p);
+        goto finish;
+    }
+
+finish:
+    pa_threaded_mainloop_unlock(pcm->p->mainloop);
+
+    return ret;
+}
+
 static int pulse_hw_params(snd_pcm_ioplug_t * io,
                snd_pcm_hw_params_t * params)
 {
@@ -748 +781 @@
     .delay = pulse_delay,
     .poll_revents = pulse_pcm_poll_revents,
     .prepare = pulse_prepare,
+    .resume = pulse_resume,
     .hw_params = pulse_hw_params,
     .close = pulse_close,
 };
@@ -761 +795 @@
     .delay = pulse_delay,
     .poll_revents = pulse_pcm_poll_revents,
     .prepare = pulse_prepare,
+    .resume = pulse_resume,
     .hw_params = pulse_hw_params,
     .close = pulse_close,
 };

pulse/pulse.c

@@ -27 +27 @@
 
 #include "pulse.h"
 
+static void context_state_cb(pa_context * c, void *userdata);
+
+static void make_new_context(snd_pulse_t *p)
+{
+    char proc[PATH_MAX], buf[PATH_MAX + 20];
+
+    assert(p);
+    assert(!p->context);
+
+    if (pa_get_binary_name(proc, sizeof(proc)))
+        snprintf(buf, sizeof(buf), "ALSA plug-in [%s]",
+             pa_path_get_filename(proc));
+    else
+        snprintf(buf, sizeof(buf), "ALSA plug-in");
+    buf[sizeof(buf)-1] = 0;
+
+    p->context =
+        pa_context_new(pa_threaded_mainloop_get_api(p->mainloop), buf);
+    assert(p->context);
+
+    pa_context_set_state_callback(p->context, context_state_cb, p);
+}
+
 int pulse_check_connection(snd_pulse_t * p)
 {
     pa_context_state_t state;
@@ -43 +66 @@
     return 0;
 }
 
+int pulse_check_connection_reconnect(snd_pulse_t * p)
+{
+    assert(p);
+    assert(p->context);
+    assert(p->mainloop);
+
+    if (pulse_check_connection(p) < 0) {
+        pa_context_disconnect(p->context);
+        pa_context_unref(p->context);
+        p->context = NULL;
+        p->state = PULSE_STATE_INIT;
+        pa_threaded_mainloop_unlock(p->mainloop); /* I don't think it is a good idea from here... */
+        make_new_context(p);
+        pulse_connect(p, p->server);
+        pa_threaded_mainloop_lock(p->mainloop);
+    }
+
+    return 0;
+}
+
 void pulse_stream_state_cb(pa_stream * s, void *userdata)
 {
     snd_pulse_t *p = userdata;
@@ -164 +207 @@
 {
     snd_pulse_t *p;
     int fd[2] = { -1, -1 };
-    char proc[PATH_MAX], buf[PATH_MAX + 20];
 
     p = calloc(1, sizeof(snd_pulse_t));
 
@@ -188 +230 @@
     if (!p->mainloop)
         goto fail;
 
-    if (pa_get_binary_name(proc, sizeof(proc)))
-        snprintf(buf, sizeof(buf), "ALSA plug-in [%s]",
-             pa_path_get_filename(proc));
-    else
-        snprintf(buf, sizeof(buf), "ALSA plug-in");
-    buf[sizeof(buf)-1] = 0;
-
-    p->context =
-        pa_context_new(pa_threaded_mainloop_get_api(p->mainloop), buf);
-    assert(p->context);
-
-    pa_context_set_state_callback(p->context, context_state_cb, p);
+    make_new_context(p);
 
     if (pa_threaded_mainloop_start(p->mainloop) < 0)
         goto fail;
@@ -238 +269 @@
     close(p->thread_fd);
     close(p->main_fd);
 
+    if (p->server)
+        free(p->server);
+
     free(p);
 }
 
@@ -250 +284 @@
     assert(p->mainloop);
     assert(p->state == PULSE_STATE_INIT);
 
+    if (!p->server)
+        p->server = server ? strdup(server) : NULL;
+
     pa_threaded_mainloop_lock(p->mainloop);
 
-    err = pa_context_connect(p->context, server, 0, NULL);
+    usleep(300000); /* FIXME: there is a race when re-connecting immediately and autospawn */
+    err = pa_context_connect(p->context, server, PA_CONTEXT_NOFAIL, NULL);
     if (err < 0)
         goto error;
 

pulse/pulse.h

@@ -29 +29 @@
 typedef struct snd_pulse {
     pa_threaded_mainloop *mainloop;
     pa_context *context;
+    char *server;
 
     int thread_fd, main_fd;
 
@@ -40 +41 @@
 } snd_pulse_t;
 
 int pulse_check_connection(snd_pulse_t * p);
+int pulse_check_connection_reconnect(snd_pulse_t * p);
 
 void pulse_stream_state_cb(pa_stream * s, void *userdata);
 void pulse_stream_success_cb(pa_stream * s, int success, void *userdata);