X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_chain.c;h=4114ca7743e4987386d6a31bd4cf11809eb9327f;hp=2510e49de1debf6122f52117702eb38fe7e472c3;hb=c04ac3f234670c8ba990c15605e1f3f6f2bf4780;hpb=40cbbb95e256e63e1e6958e9034311d4904604af

diff --git a/filter_chain.c b/filter_chain.c
index 2510e49d..4114ca77 100644
--- a/filter_chain.c
+++ b/filter_chain.c
@@ -69,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,
@@ -117,6 +120,12 @@ void filter_pre_select(__a_unused struct sched *s, struct task *t)
 	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;
+	if (fc->input_eof && *fc->input_eof)
+		goto err_out;
 again:
 	ib = fc->inbuf;
 	loaded = fc->in_loaded;
@@ -128,13 +137,14 @@ again:
 				fc, *loaded, fn->filter->name);
 			t->ret = fn->filter->convert(ib, *loaded, fn);
 			if (t->ret < 0)
-				return;
+				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",
+				PARA_DEBUG_LOG("moving %zd bytes in input "
+					"buffer for %s filter\n",
 					*loaded,  fn->filter->name);
 				memmove(ib, ib + t->ret, *loaded);
 			}
@@ -143,18 +153,21 @@ again:
 		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,
+	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;
 	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;
 }
 
@@ -176,11 +189,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);