X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=1d938c45ac059a92ac59ac364be5abc73ebc2a13;hp=a035c6e652cdfebed3d59708d763768c5c5e3bc2;hb=28ea59db9b3cd2bd9d6be0f304d951aa550ea4d6;hpb=adbf9f09c9bf2a680c61b1ef3541c04f1cde97cf diff --git a/filter.c b/filter.c index a035c6e6..1d938c45 100644 --- a/filter.c +++ b/filter.c @@ -1,176 +1,175 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2011 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * 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 "error.h" #include "string.h" +#include "stdin.h" +#include "stdout.h" +#include "error.h" -INIT_FILTER_ERRLISTS; - -#define INBUF_SIZE 32 * 1024 - -static struct filter_chain_info filter_chain_info_struct; -static struct filter_chain_info *fci = &filter_chain_info_struct; +/** The list of all status items used by para_{server,audiod,gui}. */ +const char *status_item_list[] = {STATUS_ITEM_ARRAY}; -struct gengetopt_args_info conf; +char *stat_item_values[NUM_STAT_ITEMS] = {NULL}; -__printf_2_3 void para_log(int ll, const char* fmt,...) -{ - va_list argp; - - /* ignore log message if loglevel is not high enough */ - if (ll < conf.loglevel_arg) - return; - va_start(argp, fmt); - vfprintf(stderr, fmt, argp); - va_end(argp); -} +/** Initialize the array of errors for para_filter. */ +INIT_FILTER_ERRLISTS; -static char *inbuf; -static size_t loaded; -static int eof; +/** 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; -static int init_active_filter_list(void) -{ - int i, filter_num; - struct filter_node *fn; +/** 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; - INIT_LIST_HEAD(&fci->filters); +/** Gengetopt struct that holds the command line args. */ +static struct filter_args_info conf; - fci->inbuf = inbuf; - fci->in_loaded = &loaded; - fci->eof = &eof; - - for (i = 0; i < conf.filter_given; i++) { - char *fa = para_strdup(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->fci = fci; - 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, &fci->filters); - } - if (list_empty(&fci->filters)) - return -E_NO_FILTERS; - return 1; -} +static int loglevel; +INIT_STDERR_LOGGING(loglevel); -static void open_filters(void) +__noreturn static void print_help_and_die(void) { - struct filter_node *fn; - - list_for_each_entry(fn, &fci->filters, node) { - fn->filter->open(fn); - PARA_INFO_LOG("opened %s filter\n", fn->filter->name); - fci->outbuf = fn->buf; - fci->out_loaded = &fn->loaded; - } + 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 (cmdline_parser(argc, argv, &conf)) + 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)) { - if (cmdline_parser_configfile(cf, &conf, 0, 0, 0)) + 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; } - 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); + if (!conf.filter_given) + return -E_NO_FILTERS; + return 1; } +/** + * The main function of para_filter. + * + * 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. + * + * \return \a EXIT_SUCCESS on success, EXIT_FAILURE on errors. + */ int main(int argc, char *argv[]) { - int converted, ret; - char *ib, *ob; /* input/output buffer */ - size_t *il, *ol; /* number of loaded bytes in input/output buffer */ + static struct sched s; + int i, ret; + struct filter *f; + struct btr_node *parent; + struct filter_node **fns; - filter_init(filters); + filter_init(); ret = parse_config(argc, argv); if (ret < 0) goto out; - inbuf = para_malloc(INBUF_SIZE); - ret = init_active_filter_list(); - if (ret < 0) - goto out; - open_filters(); - ib = fci->inbuf; - ob = fci->outbuf; - il = fci->in_loaded; - ol = fci->out_loaded; - PARA_DEBUG_LOG("ib %p in, ob: %p\n", ib, ob); -again: - if (*il < INBUF_SIZE && !eof) { - ret = read(STDIN_FILENO, ib + *il, INBUF_SIZE - *il); - PARA_DEBUG_LOG("read %d/%zd\n", ret, INBUF_SIZE - *il); - if (ret < 0) - goto out; - if (!ret) - eof = 1; - *il += ret; - } - ret = filter_io(fci); - if (ret < 0) - goto out; - converted = ret; - if (*ol) { - ret = write(STDOUT_FILENO, ob, *ol); - PARA_DEBUG_LOG("wrote %d/%zd\n", ret, *ol); - if (ret <= 0) - goto out; - *ol -= ret; - if (*ol) { - PARA_NOTICE_LOG("short write: %zd bytes left\n", *ol); - memmove(ob, ob + ret, *ol); + sit->btrn = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = "stdin")); + 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_cleanup; } + 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(&(struct btr_node_description) + EMBRACE(.name = f->name, .parent = parent, + .handler = f->execute, .context = 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(&(struct btr_node_description) + EMBRACE(.name = "stdout", .parent = parent)); + 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_cleanup: + for (i--; i >= 0; i--) { + struct filter_node *fn = fns[i]; + + f = filters + fn->filter_num; + if (f->close) + f->close(fn); + btr_free_node(fn->btrn); + free(fn->conf); + free(fn); } - if (!eof || converted) - goto again; - ret = 0; + free(fns); + btr_free_node(sit->btrn); + btr_free_node(sot->btrn); out: if (ret < 0) - PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret)); - close_filters(fci); - return ret; + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); + exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS); }