X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_chain.c;h=db0a4c00bd3e50e127e00c3dccc0cbc0236e3421;hp=4c1f94bcb890526548e1702209625add432232e1;hb=8cec3d1edb26b4861e2b5bdbb9f70241cdd7f03b;hpb=69f0930489da9ace5af8aee104ad21d188aed387

diff --git a/filter_chain.c b/filter_chain.c
index 4c1f94bc..db0a4c00 100644
--- a/filter_chain.c
+++ b/filter_chain.c
@@ -20,6 +20,8 @@
 
 #include "para.h"
 #include "list.h"
+#include "sched.h"
+#include "fd.h"
 #include "filter.h"
 #include "error.h"
 #include "string.h"
@@ -67,8 +69,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,83 +100,97 @@ static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen,
 /**
  * call the convert function of each filter
  *
- * \param fci the filter chain containing the list of filter nodes.
- *
  * This is the core function of the filter subsystem. It loops over the list of
- * filter nodes determined by \a fci 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_info *fci)
+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 = fci->inbuf;
-	loaded = fci->in_loaded;
+	ib = fc->inbuf;
+	loaded = fc->in_loaded;
 	conv = 0;
-	list_for_each_entry(fn, &fci->filters, node) {
-		int ret;
+	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", fci, *loaded, fn->filter->name);
-			ret = fn->filter->convert(ib, *loaded, fn);
-			if (ret < 0) {
-				if (!fci->error)
-					fci->error = -ret;
-				return ret;
-			}
-			call_callbacks(fn, ib, ret, 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",
+			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,
+				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 + ret, *loaded);
+				memmove(ib, ib + t->ret, *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: %d, "
+		"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;
 }
 
 /**
  * close all filter nodes and its callbacks
  *
- * \param fci the filter chain to close
+ * \param fc the filter chain to close
  *
- * For each filter node determined by \a fci, call the close function of each
+ * For each filter node determined by \a fc, call the close function of each
  * registered filter callback as well as the close function of the
  * corresponding filter.  Free all resources and destroy all callback lists and
  * the filter node list.
  *
  * \sa filter::close, filter_callback::close
  */
-void close_filters(struct filter_chain_info *fci)
+void close_filters(struct filter_chain *fc)
 {
 	struct filter_node *fn, *tmp;
 
-	if (!fci)
+	if (!fc)
 		return;
-	PARA_DEBUG_LOG("closing filter chain %p\n", fci);
-	list_for_each_entry_safe(fn, tmp, &fci->filters, node) {
-		PARA_NOTICE_LOG("closing %s filter callbacks (fci %p, fn %p)\n", fn->filter->name, fci, fn);
+	PARA_NOTICE_LOG("closing filter chain %p\n", fc);
+	list_for_each_entry_safe(fn, tmp, &fc->filters, node) {
 		close_callbacks(fn);
-		PARA_NOTICE_LOG("closing %s filter (fci %p, fn %p)\n", fn->filter->name, fci, fn);
+		PARA_INFO_LOG("closing %s filter\n", fn->filter->name);
 		fn->filter->close(fn);
 		list_del(&fn->node);
 		free(fn);