X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=81901896aef25294a64599c9d77f63bf541f91e4;hp=8ebceb44fd574f9a06c91d9a4c23d897827fc9a0;hb=1709cc8f8a54429441f8f83c38146e667133c727;hpb=72293235b8a21ea3cc4633005775e8ecf7d9308c;ds=sidebyside diff --git a/filter.c b/filter.c index 8ebceb44..81901896 100644 --- a/filter.c +++ b/filter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -7,7 +7,6 @@ /** \file filter.c The stand-alone filter program. */ #include -#include #include "para.h" #include "filter.cmdline.h" @@ -20,15 +19,22 @@ #include "stdin.h" #include "stdout.h" #include "error.h" +#include "version.h" + +/** Array of error strings. */ +DEFINE_PARA_ERRLIST; /** The list of all status items used by para_{server,audiod,gui}. */ const char *status_item_list[] = {STATUS_ITEM_ARRAY}; +/** + * 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. */ @@ -47,30 +53,22 @@ INIT_STDERR_LOGGING(loglevel); __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); + struct ggo_help h = DEFINE_GGO_HELP(filter); + bool d = conf.detailed_help_given; + + ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS); + print_filter_helps(d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS); + exit(EXIT_SUCCESS); } -static int parse_config(int argc, char *argv[]) +static int parse_config(void) { static char *cf; /* config file */ struct stat statbuf; - if (filter_cmdline_parser(argc, argv, &conf)) - return -E_FILTER_SYNTAX; - HANDLE_VERSION_FLAG("filter", conf); + version_handle_flag("filter", conf.version_given); 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); @@ -84,9 +82,11 @@ static int parse_config(int argc, char *argv[]) .check_ambiguity = 0, .print_errors = 1 }; - if (filter_cmdline_parser_config_file(cf, &conf, ¶ms)) - return -E_FILTER_SYNTAX; + filter_cmdline_parser_config_file(cf, &conf, ¶ms); + loglevel = get_loglevel_by_name(conf.loglevel_arg); } + if (!conf.filter_given) + return -E_NO_FILTERS; return 1; } @@ -106,22 +106,25 @@ int main(int argc, char *argv[]) { static struct sched s; int i, ret; - struct filter *f; + const struct filter *f; struct btr_node *parent; struct filter_node **fns; + filter_cmdline_parser(argc, argv, &conf); /* aborts on errors */ + loglevel = get_loglevel_by_name(conf.loglevel_arg); filter_init(); - ret = parse_config(argc, argv); + ret = parse_config(); if (ret < 0) goto out; - sit->btrn = btr_new_node("stdin", NULL, NULL, NULL); - stdin_set_defaults(sit); - register_task(&sit->task); + sit->btrn = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = "stdin")); + stdin_task_register(sit, &s); 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; + struct task_info ti; fn = fns[i] = para_calloc(sizeof(*fn)); ret = check_filter_arg(fa, &fn->conf); @@ -130,37 +133,44 @@ int main(int argc, char *argv[]) goto out_cleanup; } fn->filter_num = ret; - f = filters + fn->filter_num; - sprintf(fn->task.status, "%s", f->name); + f = filter_get(fn->filter_num); 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); + fn->btrn = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = f->name, .parent = parent, + .handler = f->execute, .context = fn)); + ti.name = f->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("stdout", parent, NULL, NULL); - stdout_set_defaults(sot); - register_task(&sot->task); + sot->btrn = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = "stdout", .parent = parent)); + stdout_task_register(sot, &s); s.default_timeout.tv_sec = 1; s.default_timeout.tv_usec = 0; btr_log_tree(sit->btrn, LL_INFO); ret = schedule(&s); + sched_shutdown(&s); out_cleanup: 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); + f = filter_get(fn->filter_num); + if (f->close) + f->close(fn); + btr_remove_node(&fn->btrn); + if (f->free_config) + f->free_config(fn->conf); free(fn); } free(fns); - btr_free_node(sit->btrn); - btr_free_node(sot->btrn); + btr_remove_node(&sit->btrn); + btr_remove_node(&sot->btrn); out: if (ret < 0) PARA_EMERG_LOG("%s\n", para_strerror(-ret));