pcm direct plugins: drain() call might be blocked when threads are used

Add SETUP state checks and do modifications according latest ALSA driver
(passing wrong event identification).

ALSA bug#4914

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c
index b648f3a9ca161031b44110faa0583fc785f1dd39..0a9047dd3a72be626335a5c188ff82def0878868 100644 (file)
--- a/src/pcm/pcm_direct.c
+++ b/src/pcm/pcm_direct.c
@@ -540,7 +540,6 @@ void snd_pcm_direct_clear_timer_queue(snd_pcm_direct_t *dmix)
 int snd_pcm_direct_timer_stop(snd_pcm_direct_t *dmix)
 {
        snd_timer_stop(dmix->timer);
-       snd_pcm_direct_clear_timer_queue(dmix);
        return 0;
 }
 
@@ -567,6 +566,7 @@ int snd_pcm_direct_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned in
        switch (snd_pcm_state(dmix->spcm)) {
        case SND_PCM_STATE_XRUN:
        case SND_PCM_STATE_SUSPENDED:
+       case SND_PCM_STATE_SETUP:
                events |= POLLERR;
                break;
        default:
@@ -577,6 +577,7 @@ int snd_pcm_direct_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned in
                        switch (snd_pcm_state(pcm)) {
                        case SND_PCM_STATE_XRUN:
                        case SND_PCM_STATE_SUSPENDED:
+                       case SND_PCM_STATE_SETUP:
                                events |= POLLERR;
                                break;
                        default:
@@ -1126,8 +1127,9 @@ int snd_pcm_direct_initialize_poll_fd(snd_pcm_direct_t *dmix)
        snd_timer_poll_descriptors(dmix->timer, &dmix->timer_fd, 1);
        dmix->poll_fd = dmix->timer_fd.fd;
 
-       dmix->timer_event_suspend = 1<<SND_TIMER_EVENT_MSUSPEND;
-       dmix->timer_event_resume = 1<<SND_TIMER_EVENT_MRESUME;
+       dmix->timer_events = (1<<SND_TIMER_EVENT_MSUSPEND) |
+                            (1<<SND_TIMER_EVENT_MRESUME) |
+                            (1<<SND_TIMER_EVENT_STOP);
 
        /*
         * Some hacks for older kernel drivers
@@ -1146,9 +1148,15 @@ int snd_pcm_direct_initialize_poll_fd(snd_pcm_direct_t *dmix)
                 * suspend/resume events.
                 */
                if (ver < SNDRV_PROTOCOL_VERSION(2, 0, 5)) {
-                       dmix->timer_event_suspend = 1<<SND_TIMER_EVENT_MPAUSE;
-                       dmix->timer_event_resume = 1<<SND_TIMER_EVENT_MCONTINUE;
+                       dmix->timer_events &= ~((1<<SND_TIMER_EVENT_MSUSPEND) |
+                                               (1<<SND_TIMER_EVENT_MRESUME));
+                       dmix->timer_events |= (1<<SND_TIMER_EVENT_MPAUSE) |
+                                             (1<<SND_TIMER_EVENT_MCONTINUE);
                }
+               /* In older versions, use SND_TIMER_EVENT_START too.
+                */
+               if (ver < SNDRV_PROTOCOL_VERSION(2, 0, 6))
+                       dmix->timer_events |= 1<<SND_TIMER_EVENT_START;
        }
        return 0;
 }
@@ -1275,8 +1283,7 @@ int snd_pcm_direct_set_timer_params(snd_pcm_direct_t *dmix)
        snd_timer_params_set_ticks(params, 1);
        if (dmix->tread) {
                filter = (1<<SND_TIMER_EVENT_TICK) |
-                        dmix->timer_event_suspend |
-                        dmix->timer_event_resume;
+                        dmix->timer_events;
                snd_timer_params_set_filter(params, filter);
        }
        ret = snd_timer_params(dmix->timer, params);

diff --git a/src/pcm/pcm_direct.h b/src/pcm/pcm_direct.h
index 006617a5f5a0e7b4985d02e7805d1209dcd592df..132c281cea6f843563c228b26db61d699cedbac7 100644 (file)
--- a/src/pcm/pcm_direct.h
+++ b/src/pcm/pcm_direct.h
@@ -142,10 +142,9 @@ struct snd_pcm_direct {
        int hw_fd;                      /* hardware file descriptor */
        struct pollfd timer_fd;
        int poll_fd;
-       int tread;
-       int timer_need_poll;
-       unsigned int timer_event_suspend;
-       unsigned int timer_event_resume;
+       int tread: 1;
+       int timer_need_poll: 1;
+       unsigned int timer_events;
        int server_fd;
        pid_t server_pid;
        snd_timer_t *timer;             /* timer used as poll_fd */

diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
index 3b791c15913102d3f58e9830f1a6786803aec4d3..cb62de928e701a9bb46c9ddde5d7b01762c5e68f 100644 (file)
--- a/src/pcm/pcm_dmix.c
+++ b/src/pcm/pcm_dmix.c
@@ -605,8 +605,8 @@ static int snd_pcm_dmix_drop(snd_pcm_t *pcm)
        snd_pcm_direct_t *dmix = pcm->private_data;
        if (dmix->state == SND_PCM_STATE_OPEN)
                return -EBADFD;
-       snd_pcm_direct_timer_stop(dmix);
        dmix->state = SND_PCM_STATE_SETUP;
+       snd_pcm_direct_timer_stop(dmix);
        return 0;
 }
 

diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
index c91fa3b18ef971e0a829a69e73223eccf28075ab..02782a788fd2c8171508f977c073196ade237cea 100644 (file)
--- a/src/pcm/pcm_dshare.c
+++ b/src/pcm/pcm_dshare.c
@@ -355,9 +355,9 @@ static int snd_pcm_dshare_drop(snd_pcm_t *pcm)
        snd_pcm_direct_t *dshare = pcm->private_data;
        if (dshare->state == SND_PCM_STATE_OPEN)
                return -EBADFD;
+       dshare->state = SND_PCM_STATE_SETUP;
        snd_pcm_direct_timer_stop(dshare);
        do_silence(pcm);
-       dshare->state = SND_PCM_STATE_SETUP;
        return 0;
 }
 

diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
index 9d42c1230339129b95d6e06aecfe8b95ca276726..15c727a59fdc366ffda127b93ed5ef24afee5c6e 100644 (file)
--- a/src/pcm/pcm_dsnoop.c
+++ b/src/pcm/pcm_dsnoop.c
@@ -280,8 +280,8 @@ static int snd_pcm_dsnoop_drop(snd_pcm_t *pcm)
        snd_pcm_direct_t *dsnoop = pcm->private_data;
        if (dsnoop->state == SND_PCM_STATE_OPEN)
                return -EBADFD;
-       snd_timer_stop(dsnoop->timer);
        dsnoop->state = SND_PCM_STATE_SETUP;
+       snd_timer_stop(dsnoop->timer);
        return 0;
 }