oss writer: Switch to the alternative post select method.

diff --git a/oss_write.c b/oss_write.c
index 57bdcfa6b9df8b7b81c4345e6332c4add44f9399..0b8f1b5fc976046aeb75056603d231aaf9c4160f 100644 (file)
--- a/oss_write.c
+++ b/oss_write.c
@@ -157,7 +157,7 @@ err_free:
        return ret;
 }
 
        return ret;
 }
 

-static void oss_post_select(__a_unused struct sched *s,
+static int oss_post_select(__a_unused struct sched *s,

                struct task *t)
 {
        struct writer_node *wn = container_of(t, struct writer_node, task);
                struct task *t)
 {
        struct writer_node *wn = container_of(t, struct writer_node, task);


@@ -181,7 +181,7 @@ static void oss_post_select(__a_unused struct sched *s,
                ret = oss_init(wn, rate, ch, format);
                if (ret < 0)
                        goto out;
                ret = oss_init(wn, rate, ch, format);
                if (ret < 0)
                        goto out;

-               return;
+               return 0;

        }
        btr_merge(btrn, wn->min_iqs);
        bytes = btr_next_buffer(btrn, &data);
        }
        btr_merge(btrn, wn->min_iqs);
        bytes = btr_next_buffer(btrn, &data);


@@ -199,9 +199,9 @@ static void oss_post_select(__a_unused struct sched *s,
        btr_consume(btrn, ret);
        ret = 0;
 out:
        btr_consume(btrn, ret);
        ret = 0;
 out:

-       t->error = ret;

        if (ret < 0)
                btr_remove_node(&wn->btrn);
        if (ret < 0)
                btr_remove_node(&wn->btrn);

+       return ret;

 }
 
 __malloc static void *oss_parse_config_or_die(int argc, char **argv)
 }
 
 __malloc static void *oss_parse_config_or_die(int argc, char **argv)


@@ -232,7 +232,8 @@ void oss_write_init(struct writer *w)
        oss_write_cmdline_parser_init(&dummy);
        w->close = oss_close;
        w->pre_select = oss_pre_select;
        oss_write_cmdline_parser_init(&dummy);
        w->close = oss_close;
        w->pre_select = oss_pre_select;

-       w->post_select = oss_post_select;
+       w->new_post_select = oss_post_select;
+       w->post_select = NULL;

        w->parse_config_or_die = oss_parse_config_or_die;
        w->free_config = oss_free_config;
        w->help = (struct ggo_help) {
        w->parse_config_or_die = oss_parse_config_or_die;
        w->free_config = oss_free_config;
        w->help = (struct ggo_help) {