X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_chain.c;h=7852220a21c416c6c7e747549e7f3ee68d2baf5f;hp=d755e43483c385a419d84d625076438a4ed9211b;hb=d0f8004acf8e8f78323d672813b4ead62d0c92ff;hpb=607ac63646d7c31aa1792dcf1d9a60e498654376 diff --git a/filter_chain.c b/filter_chain.c index d755e434..7852220a 100644 --- a/filter_chain.c +++ b/filter_chain.c @@ -1,25 +1,18 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2007 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_chain.c common helper functions for filter input/output */ +#include +#include + #include "para.h" #include "list.h" +#include "sched.h" +#include "fd.h" #include "filter.h" #include "error.h" #include "string.h" @@ -67,8 +60,11 @@ static void close_callbacks(struct filter_node *fn) { struct filter_callback *fcb, *tmp; - list_for_each_entry_safe(fcb, tmp, &fn->callbacks, node) + list_for_each_entry_safe(fcb, tmp, &fn->callbacks, node) { + PARA_INFO_LOG("closing %s filter callback\n", + fn->filter->name); close_filter_callback(fcb); + } } static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen, @@ -95,60 +91,77 @@ static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen, /** * call the convert function of each filter * - * \param fc the filter chain containing the list of filter nodes. + * \param s unused + * \param t the task containing the filter chain * * This is the core function of the filter subsystem. It loops over the list of - * filter nodes determined by \a fc and calls the filter's convert function if + * filter nodes determined by \a t and calls the filter's convert function if * there is input available for the filter node in question. If the convert * function consumed some or all of its input data, all registered input * callbacks are called. Similarly, if a convert function produced output, all * registerd output callbacks get called. * - * \return The sum of output bytes produced by the convert functions on success, - * negative return value on errors. + * \return The sum of output bytes produced by the convert functions on + * success, negative return value on errors (the return value is stored in + * t->ret). * * \sa filter_node, filter#convert, filter_callback */ -int filter_io(struct filter_chain *fc) +void filter_pre_select(__a_unused struct sched *s, struct task *t) { + struct filter_chain *fc = t->private_data; struct filter_node *fn; char *ib; size_t *loaded; int conv, conv_total = 0; + + t->ret = -E_FC_EOF; + if (fc->output_eof && *fc->output_eof) + goto err_out; again: ib = fc->inbuf; loaded = fc->in_loaded; conv = 0; list_for_each_entry(fn, &fc->filters, node) { - int ret; if (*loaded && fn->loaded < fn->bufsize) { - size_t old_fn_loaded = fn->loaded; - PARA_DEBUG_LOG("fc %p loaded: %zd, calling %s convert\n", - fc, *loaded, fn->filter->name); - ret = fn->filter->convert(ib, *loaded, fn); - if (ret < 0) { - if (!fc->error) - fc->error = -ret; - return ret; - } - call_callbacks(fn, ib, ret, fn->buf + old_fn_loaded, + size_t size, old_fn_loaded = fn->loaded; +// PARA_DEBUG_LOG("fc %p loaded: %zd, calling %s convert\n", +// fc, *loaded, fn->filter->name); + t->ret = fn->filter->convert(ib, *loaded, fn); + if (t->ret < 0) + goto err_out; + size = t->ret; + call_callbacks(fn, ib, size, fn->buf + old_fn_loaded, fn->loaded - old_fn_loaded); - *loaded -= ret; - conv += ret; - if (*loaded && ret) { - PARA_DEBUG_LOG("moving %zd bytes in input buffer for %s filter\n", - *loaded, fn->filter->name); - memmove(ib, ib + ret, *loaded); + *loaded -= size; + conv += size; + if (*loaded && size) { +// PARA_DEBUG_LOG("moving %zd bytes in input " +// "buffer for %s filter\n", +// *loaded, fn->filter->name); + memmove(ib, ib + size, *loaded); } } ib = fn->buf; loaded = &fn->loaded; } -// PARA_DEBUG_LOG("loaded: %d\n", *loaded); conv_total += conv; +// PARA_DEBUG_LOG("eof (in/out/fc): %d/%d/%d out_loaded: %zd, " +// "conv: %d, conv_total: %d\n", *fc->input_eof, +// fc->output_eof? *fc->output_eof : -42, +// fc->eof, *fc->out_loaded, conv, conv_total); if (conv) goto again; - return conv_total; + t->ret = 1; + if (!*fc->input_eof) + return; + if (*fc->out_loaded) + return; + if (*fc->in_loaded && conv_total) + return; + t->ret = -E_FC_EOF; +err_out: + fc->eof = 1; } /** @@ -169,11 +182,10 @@ void close_filters(struct filter_chain *fc) if (!fc) return; - PARA_DEBUG_LOG("closing filter chain %p\n", fc); + PARA_NOTICE_LOG("closing filter chain %p\n", fc); list_for_each_entry_safe(fn, tmp, &fc->filters, node) { - PARA_NOTICE_LOG("closing %s filter callbacks (fc %p, fn %p)\n", fn->filter->name, fc, fn); close_callbacks(fn); - PARA_NOTICE_LOG("closing %s filter (fc %p, fn %p)\n", fn->filter->name, fc, fn); + PARA_INFO_LOG("closing %s filter\n", fn->filter->name); fn->filter->close(fn); list_del(&fn->node); free(fn); @@ -202,6 +214,8 @@ static int parse_filter_args(int filter_num, char *options, void **conf) argv[0] = para_strdup(f->name); argc += 1; *conf = f->parse_config(argc, argv); + free(argv[0]); + free(argv); return *conf? filter_num : -E_BAD_FILTER_OPTIONS; }