X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=d4a2423904ca96f87f1ec11600f1c67e2b101ae1;hp=7dbc07851b00c78de96b4889663286f468611398;hb=4643fd6eeee81acc0e82e47e7895a3111775bbba;hpb=a694ab16b6ff43b545ccd530360b7224433a5b76 diff --git a/filter.c b/filter.c index 7dbc0785..d4a24239 100644 --- a/filter.c +++ b/filter.c @@ -1,153 +1,89 @@ -/* - * Copyright (C) 2005-2009 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2005 Andre Noll , see file COPYING. */ /** \file filter.c The stand-alone filter program. */ #include +#include +#include "filter.lsg.h" +#include "filter_cmd.lsg.h" #include "para.h" -#include "filter.cmdline.h" #include "list.h" +#include "lsu.h" #include "sched.h" -#include "ggo.h" +#include "buffer_tree.h" #include "filter.h" #include "string.h" #include "stdin.h" #include "stdout.h" #include "error.h" +#include "fd.h" +#include "version.h" + +/** Array of error strings. */ +DEFINE_PARA_ERRLIST; +static struct lls_parse_result *lpr; /* command line options */ + +#define CMD_PTR (lls_cmd(0, filter_suite)) +#define OPT_RESULT(_name) \ + (lls_opt_result(LSG_FILTER_PARA_FILTER_OPT_ ## _name, lpr)) +#define OPT_GIVEN(_name) (lls_opt_given(OPT_RESULT(_name))) +#define OPT_UINT32_VAL(_name) (lls_uint32_val(0, OPT_RESULT(_name))) /** The list of all status items used by para_{server,audiod,gui}. */ -const char *status_item_list[] = {STATUS_ITEM_ARRAY}; +const char *status_item_list[] = {STATUS_ITEMS}; +/** + * Dummy version which only contains NULL pointers. + * + * This is used by the amp filter which first tries to obtain the amplification + * value from an element in this array. + */ char *stat_item_values[NUM_STAT_ITEMS] = {NULL}; -/** Initialize the array of errors for para_filter. */ -INIT_FILTER_ERRLISTS; - /** The task that reads from stdin. */ static struct stdin_task stdin_task_struct; /** pointer to the stdin task. */ static struct stdin_task *sit = &stdin_task_struct; -/** The task that filters the data. */ -static struct filter_chain filter_chain_struct; -/** Pointer to the filter chain. */ -static struct filter_chain *fc = &filter_chain_struct; - /** The task that writes converted data to stdout. */ static struct stdout_task stdout_task_struct; /** Pointer to the stdout task. */ static struct stdout_task *sot = &stdout_task_struct; -/** Gengetopt struct that holds the command line args. */ -static struct filter_args_info conf; - static int loglevel; INIT_STDERR_LOGGING(loglevel); -static void open_filters(void) +static void handle_help_flag(void) { - int i; - struct filter_node *fn; - - FOR_EACH_FILTER_NODE(fn, fc, i) { - struct filter *f = filters + fn->filter_num; - f->open(fn); - PARA_INFO_LOG("opened %s filter\n", f->name); - fc->outbufp = &fn->buf; - fc->out_loaded = &fn->loaded; - } + char *help; + + if (OPT_GIVEN(DETAILED_HELP)) + help = lls_long_help(CMD_PTR); + else if (OPT_GIVEN(HELP)) + help = lls_short_help(CMD_PTR); + else + return; + printf("%s\n", help); + free(help); + print_filter_helps(OPT_GIVEN(DETAILED_HELP)); + exit(EXIT_SUCCESS); } -static void free_filter_confs(void) +static int parse_config(void) { - int i; - struct filter_node *fn; - - FOR_EACH_FILTER_NODE(fn, fc, i) - free(fn->conf); -} - -static int init_filter_chain(void) -{ - int i, ret; - struct filter_node *fn; - - if (!conf.filter_given) - return -E_NO_FILTERS; - fc->num_filters = conf.filter_given; - fc->filter_nodes = para_calloc(fc->num_filters * sizeof(struct filter_node)); - fc->inbufp = &sit->buf; - fc->in_loaded = &sit->loaded; - fc->input_error = &sit->task.error; - fc->task.error = 0; - fc->output_error = &sot->task.error; - fc->task.post_select = filter_post_select; - sprintf(fc->task.status, "filter chain"); - - FOR_EACH_FILTER_NODE(fn, fc, i) { - char *fa = conf.filter_arg[i]; - fn = fc->filter_nodes + i; - ret = check_filter_arg(fa, &fn->conf); - if (ret < 0) - goto err; - fn->filter_num = ret; - fn->fc = fc; - INIT_LIST_HEAD(&fn->callbacks); - PARA_DEBUG_LOG("filter #%d: %s\n", i, filters[fn->filter_num].name); - } - open_filters(); - return 1; -err: - free_filter_confs(); - free(fc->filter_nodes); - return ret; -} - -__noreturn static void print_help_and_die(void) -{ - int d = conf.detailed_help_given; - const char **p = d? filter_args_info_detailed_help - : filter_args_info_help; - - printf_or_die("%s\n\n", FILTER_CMDLINE_PARSER_PACKAGE "-" - FILTER_CMDLINE_PARSER_VERSION); - printf_or_die("%s\n\n", filter_args_info_usage); - for (; *p; p++) - printf_or_die("%s\n", *p); - print_filter_helps(d); - exit(0); -} + int ret; -static int parse_config(int argc, char *argv[]) -{ - static char *cf; /* config file */ - struct stat statbuf; - - if (filter_cmdline_parser(argc, argv, &conf)) - return -E_FILTER_SYNTAX; - HANDLE_VERSION_FLAG("filter", conf); - if (conf.help_given || conf.detailed_help_given) - print_help_and_die(); - loglevel = get_loglevel_by_name(conf.loglevel_arg); - if (!cf) { - char *home = para_homedir(); - cf = make_message("%s/.paraslash/filter.conf", home); - free(home); - } - if (!stat(cf, &statbuf)) { - struct filter_cmdline_parser_params params = { - .override = 0, - .initialize = 0, - .check_required = 0, - .check_ambiguity = 0, - .print_errors = 1 - }; - if (filter_cmdline_parser_config_file(cf, &conf, ¶ms)) - return -E_FILTER_SYNTAX; + version_handle_flag("filter", OPT_GIVEN(VERSION)); + handle_help_flag(); + ret = lsu_merge_config_file_options(NULL, "filter.conf", + &lpr, CMD_PTR, filter_suite, 0 /* default flags */); + if (ret < 0) + return ret; + loglevel = OPT_UINT32_VAL(LOGLEVEL); + if (!OPT_GIVEN(FILTER)) { + print_filter_list(); + exit(EXIT_SUCCESS); } return 1; } @@ -166,37 +102,80 @@ static int parse_config(int argc, char *argv[]) */ int main(int argc, char *argv[]) { - int ret; static struct sched s; + int i, ret; + const struct filter *f; + struct btr_node *parent; + struct filter_node **fns; + struct lls_parse_result *filter_lpr; /* per-filter options */ + char *errctx; - stdin_set_defaults(sit); - sit->buf = para_malloc(sit->bufsize), - - filter_init(); - ret = parse_config(argc, argv); + ret = lls(lls_parse(argc, argv, CMD_PTR, &lpr, &errctx)); if (ret < 0) goto out; - ret = init_filter_chain(); + ret = parse_config(); if (ret < 0) - goto out; - sit->output_error = &fc->task.error; - - stdout_set_defaults(sot); - sot->bufp = fc->outbufp; - sot->loaded = fc->out_loaded; - sot->input_error = &fc->task.error; + goto free_lpr; + sit->btrn = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = "stdin")); + stdin_task_register(sit, &s); + + fns = para_malloc(OPT_GIVEN(FILTER) * sizeof(*fns)); + for (i = 0, parent = sit->btrn; i < OPT_GIVEN(FILTER); i++) { + const char *fa = lls_string_val(i, OPT_RESULT(FILTER)); + const char *name; + struct filter_node *fn; + struct task_info ti; + + fn = fns[i] = para_calloc(sizeof(*fn)); + fn->filter_num = filter_setup(fa, &fn->conf, &filter_lpr); + name = filter_name(fn->filter_num); + fn->lpr = filter_lpr; + PARA_DEBUG_LOG("filter #%d: %s\n", i, name); + f = filter_get(fn->filter_num); + fn->btrn = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = name, .parent = parent, + .handler = f->execute, .context = fn)); + ti.name = name; + ti.pre_select = f->pre_select; + ti.post_select = f->post_select; + ti.context = fn; + if (f->open) + f->open(fn); + fn->task = task_register(&ti, &s); + parent = fn->btrn; + } + sot->btrn = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = "stdout", .parent = parent)); + stdout_task_register(sot, &s); - register_task(&sit->task); - register_task(&sot->task); - register_task(&fc->task); s.default_timeout.tv_sec = 1; s.default_timeout.tv_usec = 0; + btr_log_tree(sit->btrn, LL_INFO); ret = schedule(&s); - free_filter_confs(); - close_filters(fc); + sched_shutdown(&s); + for (i--; i >= 0; i--) { + struct filter_node *fn = fns[i]; + + f = filter_get(fn->filter_num); + if (f->close) + f->close(fn); + btr_remove_node(&fn->btrn); + if (f->teardown) + f->teardown(fn->lpr, fn->conf); + free(fn); + } + free(fns); + btr_remove_node(&sit->btrn); + btr_remove_node(&sot->btrn); +free_lpr: + lls_free_parse_result(lpr, CMD_PTR); out: - free(sit->buf); - if (ret < 0) - PARA_EMERG_LOG("%s\n", para_strerror(-ret)); - return ret < 0? EXIT_FAILURE : EXIT_SUCCESS; + if (ret < 0) { + if (errctx) + PARA_ERROR_LOG("%s\n", errctx); + free(errctx); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + } + exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS); }