X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=832ca22bdaec105b5c4fc2e459b3770e6730acfb;hp=bab827d326c31d47063a8bf04e2083d18c966c52;hb=aa234b7afe223879a7bd7274ce05a3a315a2ec49;hpb=4524d2408d085cca4af1a783f52174128e45b16c diff --git a/filter.c b/filter.c index bab827d3..832ca22b 100644 --- a/filter.c +++ b/filter.c @@ -1,22 +1,29 @@ /* - * Copyright (C) 2005-2008 Andre Noll + * Copyright (C) 2005-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file filter.c The stand-alone filter program. */ -#include "para.h" +#include +#include +#include "para.h" #include "filter.cmdline.h" #include "list.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" +/** The list of all status items used by para_{server,audiod,gui}. */ +const char *status_item_list[] = {STATUS_ITEM_ARRAY}; + char *stat_item_values[NUM_STAT_ITEMS] = {NULL}; /** Initialize the array of errors for para_filter. */ @@ -40,7 +47,8 @@ static struct stdout_task *sot = &stdout_task_struct; /** Gengetopt struct that holds the command line args. */ static struct filter_args_info conf; -INIT_STDERR_LOGGING(conf.loglevel_arg); +static int loglevel; +INIT_STDERR_LOGGING(loglevel); static void open_filters(void) { @@ -51,11 +59,20 @@ static void open_filters(void) struct filter *f = filters + fn->filter_num; f->open(fn); PARA_INFO_LOG("opened %s filter\n", f->name); - fc->outbuf = fn->buf; + fc->outbufp = &fn->buf; fc->out_loaded = &fn->loaded; } } +static void free_filter_confs(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; @@ -64,13 +81,13 @@ static int init_filter_chain(void) if (!conf.filter_given) return -E_NO_FILTERS; fc->num_filters = conf.filter_given; - fc->filter_nodes = para_malloc(fc->num_filters * sizeof(struct filter_node)); - fc->inbuf = sit->buf; + 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.pre_select = filter_pre_select; + fc->task.post_select = filter_post_select; sprintf(fc->task.status, "filter chain"); FOR_EACH_FILTER_NODE(fn, fc, i) { @@ -87,19 +104,37 @@ static int init_filter_chain(void) 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); +} + static int parse_config(int argc, char *argv[]) { static char *cf; /* config file */ struct stat statbuf; - int i; 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); @@ -110,20 +145,74 @@ static int parse_config(int argc, char *argv[]) .override = 0, .initialize = 0, .check_required = 0, - .check_ambiguity = 0 + .check_ambiguity = 0, + .print_errors = 1 }; if (filter_cmdline_parser_config_file(cf, &conf, ¶ms)) return -E_FILTER_SYNTAX; } - if (!conf.list_filters_given) - return 1; - printf("available filters: "); - for (i = 0; filters[i].name; i++) - printf("%s%s%s", i? " " : "", filters[i].name, - filters[i].parse_config? "*": ""); - printf("\nFilters marked with \"*\" have further command line options. Try\n" - "\tpara_filter -f ' -h'\nfor more information.\n"); - exit(EXIT_SUCCESS); + return 1; +} + +/* TODO: support more than one filter, actually parse options */ +static int __noreturn main_btr(void) +{ + static struct sched s; + int i, ret; + struct filter *f; + struct btr_node *parent; + struct filter_node **fns; + + sit->btrn = btr_new_node("stdin", NULL, NULL, NULL); + stdin_set_defaults(sit); + register_task(&sit->task); + + fns = para_malloc(conf.filter_given * sizeof(*fns)); + for (i = 0, parent = sit->btrn; i < conf.filter_given; i++) { + char *fa = conf.filter_arg[i]; + struct filter_node *fn; + + fn = fns[i] = para_calloc(sizeof(*fn)); + ret = check_filter_arg(fa, &fn->conf); + if (ret < 0) { + free(fn); + goto out; + } + fn->filter_num = ret; + f = filters + fn->filter_num; + sprintf(fn->task.status, "%s", f->name); + PARA_DEBUG_LOG("filter #%d: %s\n", i, f->name); + fn->btrn = btr_new_node(f->name, parent, f->execute, fn); + fn->task.pre_select = f->pre_select; + fn->task.post_select = f->post_select; + f->open(fn); + register_task(&fn->task); + parent = fn->btrn; + } + sot->btrn = btr_new_node("stdout", parent, NULL, NULL); + stdout_set_defaults(sot); + register_task(&sot->task); + + s.default_timeout.tv_sec = 1; + s.default_timeout.tv_usec = 0; + btr_log_tree(sit->btrn, LL_INFO); + ret = schedule(&s); +out: + for (i--; i >= 0; i--) { + struct filter_node *fn = fns[i]; + + f = filters + fn->filter_num; + f->close(fn); + btr_free_node(fn->btrn); + free(fn->conf); + free(fn); + } + free(fns); + btr_free_node(sit->btrn); + btr_free_node(sot->btrn); + if (ret < 0) + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); + exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS); } /** @@ -143,28 +232,34 @@ int main(int argc, char *argv[]) int ret; static struct sched s; - stdin_set_defaults(sit); - sit->buf = para_malloc(sit->bufsize), - - filter_init(filters); + filter_init(); ret = parse_config(argc, argv); if (ret < 0) goto out; + if (conf.buffer_tree_given) { + ret = main_btr(); + goto out; + } + stdin_set_defaults(sit); + sit->buf = para_malloc(sit->bufsize), + ret = init_filter_chain(); if (ret < 0) goto out; + sit->output_error = &fc->task.error; stdout_set_defaults(sot); - sot->buf = fc->outbuf; + sot->bufp = fc->outbufp; sot->loaded = fc->out_loaded; sot->input_error = &fc->task.error; register_task(&sit->task); - register_task(&fc->task); register_task(&sot->task); + register_task(&fc->task); s.default_timeout.tv_sec = 1; s.default_timeout.tv_usec = 0; ret = schedule(&s); + free_filter_confs(); close_filters(fc); out: free(sit->buf);