X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_chain.c;h=f0b6095da6b5c9a012b6e7c7da13180a06803863;hp=5b87b087f6075770ab3a84a8bdbdac814afb99a4;hb=9f021e58c181e2cd2e1e245fcd7b84f33ad50f9d;hpb=b0cad48a864fe3f621138e717ff025060c396fad

diff --git a/filter_chain.c b/filter_chain.c
index 5b87b087..f0b6095d 100644
--- a/filter_chain.c
+++ b/filter_chain.c
@@ -1,23 +1,14 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 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"
@@ -69,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,
@@ -97,6 +91,9 @@ 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
@@ -118,41 +115,46 @@ void filter_pre_select(__a_unused struct sched *s, struct task *t)
 	size_t *loaded;
 	int conv, conv_total = 0;
 
-	t->ret = -E_FC_EOF;
-	if (*fc->output_eof)
+	if (fc->output_error && *fc->output_error) {
+		t->ret =  *fc->output_error;
 		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)
 				goto err_out;
-			call_callbacks(fn, ib, t->ret, fn->buf + old_fn_loaded,
+			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("eof (in/out/fc): %d/%d/%d out_loaded: %d, conv: %d, conv_total: %d\n", *fc->input_eof,
-		*fc->output_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->input_eof)
+	if (!*fc->input_error)
 		return;
 	if (*fc->out_loaded)
 		return;
@@ -160,7 +162,7 @@ again:
 		return;
 	t->ret = -E_FC_EOF;
 err_out:
-	fc->eof = 1;
+	fc->error = t->ret;
 }
 
 /**
@@ -181,11 +183,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);
@@ -214,6 +215,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;
 }