/*
- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file write_common.c common functions of para_audiod and para_write */
#include <regex.h>
-#include <stdbool.h>
#include "para.h"
#include "string.h"
#include "buffer_tree.h"
#include "write.h"
#include "error.h"
+#include "write_common.h"
/** the array containing the names of all supported writers */
const char *writer_names[] ={WRITER_NAMES};
writers[i].init(&writers[i]);
}
/**
- * check if given string is a valid command line for any writer
+ * Check if given string is a valid command line for any writer.
*
- * \param \wa string of the form writer_name:options
- * \param writer_num contains the number of the writer upon success
+ * \param \wa String of the form writer_name:options.
+ * \param writer_num Contains the number of the writer upon success.
*
* This function checks whether \a wa starts with the name of a supported
* paraslash writer, optionally followed by a colon and any options for that
*
* \return On success, a pointer to the gengetopt args info struct is returned
* and \a writer_num contains the number of the writer. Otherwise this function
- * returns \p NULL.
+ * prints an error message and calls exit().
*/
-void *check_writer_arg(const char *wa, int *writer_num)
+void *check_writer_arg_or_die(const char *wa, int *writer_num)
{
- int i;
-
- *writer_num = -E_WRITE_COMMON_SYNTAX;
- PARA_INFO_LOG("checking %s\n", wa);
+ int i, ret, argc;
+ const char *cmdline;
+ char **argv;
+ void *conf;
+
+ if (!wa || !*wa) {
+ i = DEFAULT_WRITER;
+ cmdline = NULL;
+ goto check;
+ }
+ PARA_INFO_LOG("checking %s\n", wa);
FOR_EACH_WRITER(i) {
const char *name = writer_names[i];
size_t len = strlen(name);
char c;
+
if (strlen(wa) < len)
continue;
if (strncmp(name, wa, len))
continue;
c = wa[len];
- if (c && c != ' ')
- continue;
- *writer_num = i;
- return writers[i].parse_config_or_die(c? wa + len + 1 : "");
+ if (!c || c == ' ') {
+ cmdline = c? wa + len + 1 : NULL;
+ goto check;
+ }
}
- PARA_ERROR_LOG("writer not found\n");
- return NULL;
-}
-
-void register_writer_node(struct writer_node *wn, struct btr_node *parent)
-{
- struct writer *w = writers + wn->writer_num;
- char *name = make_message("%s writer", writer_names[wn->writer_num]);
- int ret;
-
- wn->btrn = btr_new_node(&(struct btr_node_description)
- EMBRACE(.name = name, .parent = parent,
- .handler = w->execute, .context = wn));
- strcpy(wn->task.status, name);
- free(name);
- ret = w->open(wn);
- wn->task.post_select = w->post_select;
- wn->task.pre_select = w->pre_select;
- register_task(&wn->task);
+ PARA_EMERG_LOG("invalid writer %s\n", wa);
+ exit(EXIT_FAILURE);
+check:
+ ret = create_shifted_argv(cmdline, " \t", &argv);
+ if (ret < 0) {
+ PARA_EMERG_LOG("%s: %s\n", wa, para_strerror(-ret));
+ exit(EXIT_FAILURE);
+ }
+ argc = ret;
+ argv[0] = make_message("%s_write", writer_names[i]);
+ *writer_num = i;
+ conf = writers[i].parse_config_or_die(argc, argv);
+ free_argv(argv);
+ return conf;
}
/**
- * Setup a writer node with the default writer.
- *
- * If arg is \p NULL, the OS-dependent default writer is used with an empty
- * configuration string. It defaults to alsa for Linux, osx for OS X, oss for
- * *BSD and the file writer if neither of these is supported.
+ * Open a writer node and register the corresponding task.
*
- * Once the writer configuration has been retrieved, a writer node is created,
- * its buffer tree node is added to the buffer tree as a child of the given
- * parent.
+ * \param wn The writer node to open.
+ * \param parent The parent btr node (the source for the writer node).
+ * \param s The scheduler instance to register the task to.
*
- * Finally, the new writer node's taks structure is initialized and registered
- * to the paraslash scheduler.
- *
- * \return A pointer to the allocated writer node group.
+ * The configuration of the writer node stored in \p wn->conf must be
+ * initialized before this function may be called.
*/
-int setup_writer_node(const char *arg, struct btr_node *parent,
- struct writer_node *wn)
+void register_writer_node(struct writer_node *wn, struct btr_node *parent,
+ struct sched *s)
{
- if (arg)
- wn->conf = check_writer_arg(arg, &wn->writer_num);
- else {
- wn->writer_num = DEFAULT_WRITER;
- wn->conf = writers[DEFAULT_WRITER].parse_config_or_die("");
- }
- if (!wn->conf)
- return -E_WRITE_COMMON_SYNTAX;
- register_writer_node(wn, parent);
- return 1;
+ struct writer *w = writers + wn->writer_num;
+
+ wn->btrn = btr_new_node(&(struct btr_node_description)
+ EMBRACE(.name = writer_names[wn->writer_num], .parent = parent,
+ .handler = w->execute, .context = wn));
+ wn->task = task_register(&(struct task_info) {
+ .name = writer_names[wn->writer_num],
+ .pre_select = w->pre_select,
+ .post_select = w->post_select,
+ .context = wn,
+ }, s);
}
/**
* Print the help text of all writers to stdout.
*
- * \param detailed Whether to print the detailed help text.
+ * \param flags Passed to \ref ggo_print_help().
*/
-void print_writer_helps(int detailed)
+void print_writer_helps(unsigned flags)
{
int i;
- printf_or_die("\nAvailable writers: \n\t");
+ printf_or_die("\nAvailable writers: ");
FOR_EACH_WRITER(i)
printf_or_die("%s%s", i? " " : "", writer_names[i]);
- printf_or_die("\n\n");
+ printf_or_die("\n");
FOR_EACH_WRITER(i) {
struct writer *w = writers + i;
if (!w->help.short_help)
continue;
- printf_or_die("Options for %s:\n", writer_names[i]);
- ggo_print_help(&w->help, detailed);
+ printf_or_die("\n%s: %s", writer_names[i],
+ w->help.purpose);
+ ggo_print_help(&w->help, flags);
}
}
char *buf = NULL;
int ret = btr_exec_up(btrn, cmd, &buf);
- assert(ret >= 0);
+ if (ret < 0) {
+ /*
+ * This really should not happen. It means one of our parent
+ * nodes died unexpectedly. Proceed with fingers crossed.
+ */
+ PARA_CRIT_LOG("cmd %s: %s\n", cmd, para_strerror(-ret));
+ *result = 0;
+ return;
+ }
ret = para_atoi32(buf, result);
assert(ret >= 0);
free(buf);
projects / paraslash.git / blobdiff