X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_chain.c;h=3684ee6b0304b8c5a381d1b2ce8d06a3aff339bb;hp=db0a4c00bd3e50e127e00c3dccc0cbc0236e3421;hb=8a8cd0f5bb40dcfad68608193e8c57decd90b25e;hpb=f23be61d476e3f354e31072da0e0e77050a8dc56

diff --git a/filter_chain.c b/filter_chain.c
index db0a4c00..3684ee6b 100644
--- a/filter_chain.c
+++ b/filter_chain.c
@@ -124,6 +124,8 @@ void filter_pre_select(__a_unused struct sched *s, struct task *t)
 	t->ret = -E_FC_EOF;
 	if (fc->output_eof && *fc->output_eof)
 		goto err_out;
+	if (fc->input_eof && *fc->input_eof && !*fc->in_loaded)
+		goto err_out;
 again:
 	ib = fc->inbuf;
 	loaded = fc->in_loaded;
@@ -131,8 +133,8 @@ again:
 	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);
+//			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;
@@ -141,9 +143,9 @@ again:
 			*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);
+//				PARA_DEBUG_LOG("moving %zd bytes in input "
+//					"buffer for %s filter\n",
+//					*loaded,  fn->filter->name);
 				memmove(ib, ib + t->ret, *loaded);
 			}
 		}
@@ -151,10 +153,10 @@ again:
 		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->output_eof : -42,
-		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;