/*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
*
- * 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 <sys/types.h>
+#include <dirent.h>
+
#include "para.h"
#include "list.h"
#include "sched.h"
{
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,
/**
* call the convert function of each filter
*
+ * \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 t and calls the filter's convert function if
* there is input available for the filter node in question. If the convert
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) {
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);
+ 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)
- return;
- call_callbacks(fn, ib, t->ret, fn->buf + old_fn_loaded,
+ goto err_out;
+ size = t->ret;
+ call_callbacks(fn, ib, size, fn->buf + old_fn_loaded,
fn->loaded - old_fn_loaded);
- *loaded -= t->ret;
- conv += t->ret;
- if (*loaded && t->ret) {
- PARA_DEBUG_LOG("moving %zd bytes in input buffer for %s filter\n",
- *loaded, fn->filter->name);
- memmove(ib, ib + t->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;
}
conv_total += conv;
- PARA_DEBUG_LOG("reader eof: %d, eof: %d out_loaded: %d, conv: %d, conv_total: %d\n", *fc->reader_eof,
- fc->eof, *fc->out_loaded, conv, conv_total);
+// 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;
t->ret = 1;
- if (!*fc->reader_eof)
+ 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;
}
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);
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;
}