X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=88a0bd75dcb2ec3a70cd83854827aca3dce9b8a6;hp=52a1ce5bf05c85c514f56e67cc4cf5ff5da6ce30;hb=1e012cf40238883621692051a22fb9c7cad5e944;hpb=5c556c52f1196cea4536d36b683372de532943a9;ds=sidebyside diff --git a/filter.c b/filter.c index 52a1ce5b..88a0bd75 100644 --- a/filter.c +++ b/filter.c @@ -1,108 +1,140 @@ /* - * Copyright (C) 2005-2007 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" +/** \file filter.c The stand-alone filter program. */ + +#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" -/** init the array of errors for para_filter */ +/** 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. */ INIT_FILTER_ERRLISTS; -/** the task that reads from stdin */ +/** The task that reads from stdin. */ static struct stdin_task stdin_task_struct; -/** pointer to the stdin task */ +/** pointer to the stdin task. */ static struct stdin_task *sit = &stdin_task_struct; -/** the task that filters the data */ +/** The task that filters the data. */ static struct filter_chain filter_chain_struct; -/** pointer to the filter chain */ +/** Pointer to the filter chain. */ static struct filter_chain *fc = &filter_chain_struct; -/** the task that writes converted data to stdout */ +/** The task that writes converted data to stdout. */ static struct stdout_task stdout_task_struct; -/** pointer to the stdout task */ +/** Pointer to the stdout task. */ static struct stdout_task *sot = &stdout_task_struct; -/** gengetopt struct that holds the command line args */ +/** Gengetopt struct that holds the command line args. */ static struct filter_args_info conf; -INIT_STDERR_LOGGING(conf.loglevel_arg); - -static void filter_event_handler(struct task *t) -{ - PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret)); - unregister_task(t); -} +static int loglevel; +INIT_STDERR_LOGGING(loglevel); static void open_filters(void) { + int i; struct filter_node *fn; - list_for_each_entry(fn, &fc->filters, node) { - fn->filter->open(fn); - PARA_INFO_LOG("opened %s filter\n", fn->filter->name); - fc->outbuf = fn->buf; + 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; } } -static int init_filter_chain(void) +static void free_filter_confs(void) { - int i, filter_num; + int i; struct filter_node *fn; - INIT_LIST_HEAD(&fc->filters); + FOR_EACH_FILTER_NODE(fn, fc, i) + free(fn->conf); +} + +static int init_filter_chain(void) +{ + int i, ret; + struct filter_node *fn; - fc->inbuf = sit->buf; + 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_eof = &sit->eof; - fc->eof = 0; - fc->output_eof = &sot->eof; - fc->task.private_data = fc; - fc->task.pre_select = filter_pre_select; - fc->task.event_handler = filter_event_handler; + 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 (i = 0; i < conf.filter_given; i++) { + FOR_EACH_FILTER_NODE(fn, fc, i) { char *fa = conf.filter_arg[i]; - fn = para_calloc(sizeof(struct filter_node)); - filter_num = check_filter_arg(fa, &fn->conf); - if (filter_num < 0) { - free(fn); - return filter_num; - } + 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); - fn->filter = &filters[filter_num]; - PARA_DEBUG_LOG("adding %s to filter chain\n", fn->filter->name); - list_add_tail(&fn->node, &fc->filters); + PARA_DEBUG_LOG("filter #%d: %s\n", i, filters[fn->filter_num].name); } - if (list_empty(&fc->filters)) - return -E_NO_FILTERS; 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); @@ -113,65 +145,109 @@ 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; + + sit->btrn = btr_new_node("stdin", NULL, NULL, NULL); + stdin_set_defaults(sit); + register_task(&sit->task); + + for (i = 0, parent = sit->btrn; i < conf.filter_given; i++) { + char *fa = conf.filter_arg[i]; + struct filter_node *fn = para_calloc(sizeof(*fn)); + + ret = check_filter_arg(fa, &fn->conf); + if (ret < 0) { + free(fn); + goto err; + } + 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; + ret = schedule(&s); +err: + if (ret < 0) + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); + exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS); } /** - * para_filter's main function. + * The main function of para_filter. * - * para_filter reads data from stdin, converts it by using a chain + * Para_filter reads data from stdin, converts it by using a chain * of filters (specified on the command line) and writes the resulting * data to stdout. * - * \param argc number of command line options - * \param argv vector of arguments + * \param argc Number of command line options. + * \param argv Vector of arguments. * * \return \a EXIT_SUCCESS on success, EXIT_FAILURE on errors. */ int main(int argc, char *argv[]) { int ret; - struct sched s; + 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_eof = &fc->eof; + 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); - close_filters(fc); if (ret < 0) - PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); return ret < 0? EXIT_FAILURE : EXIT_SUCCESS; }