Convert writers to lopsub.

[paraslash.git] / write.c

diff --git a/write.c b/write.c
index 0be4a783cfb196a8b8b66f43c00a91abca578c54..98cd3557e0f3e7a60b0019a309cfe61d63fa5824 100644 (file)
--- a/write.c
+++ b/write.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -8,7 +8,9 @@
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include <regex.h>
 #include <sys/types.h>

+#include <lopsub.h>

 
 

+#include "write_cmd.lsg.h"

 #include "para.h"
 #include "string.h"
 #include "write.cmdline.h"
 #include "para.h"
 #include "string.h"
 #include "write.cmdline.h"


@@ -18,13 +20,13 @@
 #include "stdin.h"
 #include "buffer_tree.h"
 #include "write.h"
 #include "stdin.h"
 #include "buffer_tree.h"
 #include "write.h"

-#include "write_common.h"

 #include "fd.h"
 #include "error.h"
 #include "version.h"
 #include "check_wav.h"
 
 #include "fd.h"
 #include "error.h"
 #include "version.h"
 #include "check_wav.h"
 

-INIT_WRITE_ERRLISTS;
+/** Array of error strings. */
+DEFINE_PARA_ERRLIST;

 
 static struct write_args_info conf;
 
 
 static struct write_args_info conf;
 


@@ -35,126 +37,88 @@ INIT_STDERR_LOGGING(loglevel)
 
 __noreturn static void print_help_and_die(void)
 {
 
 __noreturn static void print_help_and_die(void)
 {

-       int d = conf.detailed_help_given;
-       const char **p = d? write_args_info_detailed_help
-               : write_args_info_help;
-
-       printf_or_die("%s\n\n", WRITE_CMDLINE_PARSER_PACKAGE "-"
-               WRITE_CMDLINE_PARSER_VERSION);
-       printf_or_die("%s\n\n", write_args_info_usage);
-       for (; *p; p++)
-               printf_or_die("%s\n", *p);
+       struct ggo_help h = DEFINE_GGO_HELP(write);
+       bool d = conf.detailed_help_given;
+
+       ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);

        print_writer_helps(d);
        exit(0);
 }
 
        print_writer_helps(d);
        exit(0);
 }
 

-/*
- * Parse config and register a task for a writer node.
- *
- * \param arg Command line arguments.
- * \param parent The new node will be a child of \a parent.
- * \param wn The writer node.
- *
- * If arg is \p NULL, the OS-dependent default writer is used with no
- * arguments.  The default writers are alsa for Linux, osx for OS X, oss for
- * *BSD, and the file writer if the default writer is not supported.
- *
- * Once the writer configuration has been retrieved from the ->parse_config
- * callback a writer node is created, its buffer tree node is added to the
- * buffer tree as a child of the given parent.
- *
- * Finally, the new writer node's task structure is initialized and registered
- * to the paraslash scheduler.
- *
- * \return Standard.
- */
-static void setup_writer_node(const char *arg, struct btr_node *parent,
-               struct writer_node *wn, struct sched *s)
-{
-       wn->conf = check_writer_arg_or_die(arg, &wn->writer_num);
-       register_writer_node(wn, parent, s);
-}
-

 struct write_task {
 struct write_task {

-       struct task task;
+       struct task *task;

        struct check_wav_context *cwc;
 };
 
        struct check_wav_context *cwc;
 };
 

-static void write_pre_select(struct sched *s, struct task *t)
+static void write_pre_select(struct sched *s, void *context)

 {
 {

-       struct write_task *wt = container_of(t, struct write_task, task);
+       struct write_task *wt = context;

        check_wav_pre_select(s, wt->cwc);
 }
 
        check_wav_pre_select(s, wt->cwc);
 }
 

-static void write_post_select(__a_unused struct sched *s, struct task *t)
+static int write_post_select(__a_unused struct sched *s, void *context)

 {
 {

-       struct write_task *wt = container_of(t, struct write_task, task);
-       t->error = check_wav_post_select(wt->cwc);
+       struct write_task *wt = context;
+       return check_wav_post_select(wt->cwc);

 }
 
 static int setup_and_schedule(void)
 {
 }
 
 static int setup_and_schedule(void)
 {

-       int i, ret;
+       int i, n, ret;

        struct btr_node *cw_btrn;
        struct writer_node *wns;
        static struct sched s;
        struct wav_params wp;
        struct btr_node *cw_btrn;
        struct writer_node *wns;
        static struct sched s;
        struct wav_params wp;

-       struct write_task wt = {
-               .task = {
-                       .pre_select = write_pre_select,
-                       .post_select = write_post_select,
-                       .status = "write task",
-               },
-       };
+       struct write_task wt;

 
 

-       loglevel = get_loglevel_by_name(conf.loglevel_arg);

        sit.btrn = btr_new_node(&(struct btr_node_description)
                EMBRACE(.name = "stdin"));
        sit.btrn = btr_new_node(&(struct btr_node_description)
                EMBRACE(.name = "stdin"));

-       stdin_set_defaults(&sit);
-       register_task(&s, &sit.task);
+       stdin_task_register(&sit, &s);

 
        COPY_WAV_PARMS(&wp, &conf);
        wt.cwc = check_wav_init(sit.btrn, NULL, &wp, &cw_btrn);
 
        COPY_WAV_PARMS(&wp, &conf);
        wt.cwc = check_wav_init(sit.btrn, NULL, &wp, &cw_btrn);

-       register_task(&s, &wt.task);
-       if (!conf.writer_given) {
-               wns = para_calloc(sizeof(*wns));
-               setup_writer_node(NULL, cw_btrn, wns, &s);
-               i = 1;
-       } else {
-               wns = para_calloc(conf.writer_given * sizeof(*wns));
-               for (i = 0; i < conf.writer_given; i++)
-                       setup_writer_node(conf.writer_arg[i], cw_btrn,
-                               wns + i, &s);
+       wt.task = task_register(&(struct task_info) {
+               .name = "write",
+               .pre_select = write_pre_select,
+               .post_select = write_post_select,
+               .context = &wt,
+       }, &s);
+
+       n = conf.writer_given > 0? conf.writer_given : 1;
+       wns = para_calloc(n * sizeof(*wns));
+       for (i = 0; i < n; i++) {
+               char *arg = i < conf.writer_given?  conf.writer_arg[i] : NULL;
+               wns[i].wid = check_writer_arg_or_die(arg, &wns[i].lpr);
+               register_writer_node(wns + i, cw_btrn, &s);

        }
        }

-

        s.default_timeout.tv_sec = 10;
        s.default_timeout.tv_usec = 50000;
        ret = schedule(&s);
        if (ret >= 0) {
        s.default_timeout.tv_sec = 10;
        s.default_timeout.tv_usec = 50000;
        ret = schedule(&s);
        if (ret >= 0) {

-               int j;
-               for (j = 0; j < i; j++) {
-                       struct task *t = &wns[j].task;
-                       assert(t->error < 0);
-                       if (t->error != -E_WRITE_COMMON_EOF
-                                       && t->error != -E_BTR_EOF) {
-                               PARA_ERROR_LOG("%s: %s\n", t->status,
-                                       para_strerror(-t->error));
+               int j, ts;
+               for (j = 0; j < n; j++) {
+                       struct writer_node *wn = wns + j;
+                       ts = task_status(wn->task);
+                       assert(ts < 0);
+                       if (ts != -E_WRITE_COMMON_EOF && ts != -E_BTR_EOF) {
+                               const char *name = writer_name(wn->wid);
+                               PARA_ERROR_LOG("%s: %s\n", name,
+                                       para_strerror(-ts));

                                if (ret >= 0)
                                if (ret >= 0)

-                                       ret = t->error;
+                                       ret = ts;

                        }
                }
        }
                        }
                }
        }

-       for (i--; i >= 0; i--) {
+       for (i = n - 1; i >= 0; i--) {

                struct writer_node *wn = wns + i;
                struct writer_node *wn = wns + i;

-               struct writer *w = writers + wn->writer_num;
-
-               w->close(wn);
+               writer_get(wn->wid)->close(wn);

                btr_remove_node(&wn->btrn);
                btr_remove_node(&wn->btrn);

-               w->free_config(wn->conf);
-               free(wn->conf);
+               lls_free_parse_result(wns[i].lpr,
+                       lls_cmd(wn->wid, write_cmd_suite));

        }
        free(wns);
        check_wav_shutdown(wt.cwc);
        }
        free(wns);
        check_wav_shutdown(wt.cwc);

+       sched_shutdown(&s);

        return ret;
 }
 
        return ret;
 }
 


@@ -173,9 +137,9 @@ int main(int argc, char *argv[])
 {
        int ret;
 
 {
        int ret;
 

-       writer_init();

        write_cmdline_parser(argc, argv, &conf);
        write_cmdline_parser(argc, argv, &conf);

-       HANDLE_VERSION_FLAG("write", conf);
+       loglevel = get_loglevel_by_name(conf.loglevel_arg);
+       version_handle_flag("write", conf.version_given);

        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();
 
        if (conf.help_given || conf.detailed_help_given)
                print_help_and_die();