write: Rename main_btr() to setup_and_schedule().

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index c2a4cc1e94f47d9cf9717334059e6cf57df4970a..5965159ed9e50af87401f4f2968d7155439bb568 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -145,14 +145,19 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
 {
        struct writer_node *wn = container_of(t, struct writer_node, task);
        struct private_alsa_write_data *pad = wn->private_data;
-       struct timeval tv;
        snd_pcm_sframes_t avail, underrun;
        int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
        if (ret == 0)
                return;
-       if (ret < 0 || !pad)
-               return sched_min_delay(s);
+       if (!pad) {
+               sched_min_delay(s);
+               return;
+       }
+       if (ret < 0) {
+               sched_request_barrier_or_min_delay(&pad->drain_barrier, s);
+               return;
+       }
        /*
         * Data is available to be written to the alsa handle.  Compute number
         * of milliseconds until next buffer underrun would occur.
@@ -171,8 +176,7 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
        if (underrun < 50)
                underrun = 50;
        underrun -= 50;
-       ms2tv(underrun, &tv);
-       sched_request_timeout(&tv, s);
+       sched_request_timeout_ms(underrun, s);
 }
 
 static void alsa_close(struct writer_node *wn)
@@ -253,7 +257,9 @@ again:
        }
        frames = bytes / pad->bytes_per_frame;
        frames = snd_pcm_writei(pad->handle, data, frames);
-       if (frames >= 0) {
+       if (frames == 0 || frames == -EAGAIN)
+               return;
+       if (frames > 0) {
                btr_consume(btrn, frames * pad->bytes_per_frame);
                goto again;
        }
@@ -262,8 +268,6 @@ again:
                snd_pcm_prepare(pad->handle);
                return;
        }
-       if (frames == -EAGAIN)
-               return;
        PARA_WARNING_LOG("%s\n", snd_strerror(-frames));
        ret = -E_ALSA_WRITE;
 err:
@@ -276,7 +280,6 @@ __malloc static void *alsa_parse_config_or_die(const char *options)
 {
        struct alsa_write_args_info *conf = para_calloc(sizeof(*conf));
 
-       PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
        /* exits on errors */
        alsa_cmdline_parser_string(options, conf, "alsa_write");
        return conf;