X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_common.c;h=7c71ff39243a7a63f7026c11726418377790c87e;hp=2c74e8c702ad729928bbac1835a7f28d131e5d83;hb=b9c2428555a2a6edb038234a33e5072dc8c5ba7a;hpb=5440b8c0464829022a0ba5dd5daa931b15712a11

diff --git a/filter_common.c b/filter_common.c
index 2c74e8c7..7c71ff39 100644
--- a/filter_common.c
+++ b/filter_common.c
@@ -6,6 +6,7 @@
 
 /** \file filter_common.c Common helper functions for filter input/output. */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
 
@@ -43,7 +44,7 @@ void filter_init(void)
  */
 static void close_filter_callback(struct filter_callback *fcb)
 {
-	PARA_NOTICE_LOG("closing filter_callback %p, data: %p\n", fcb, fcb->data);
+	PARA_NOTICE_LOG("closing filter_callback %p\n", fcb);
 	list_del(&fcb->node);
 	fcb->close(fcb);
 }
@@ -105,7 +106,7 @@ static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen,
  *
  * \sa filter_node, filter#convert, filter_callback.
  */
-void filter_pre_select(__a_unused struct sched *s, struct task *t)
+void filter_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_chain *fc = container_of(t, struct filter_chain, task);
 	struct filter_node *fn;
@@ -142,19 +143,6 @@ again:
 	conv_total += conv;
 	if (conv)
 		goto again;
-	if (conv_total) {
-		/*
-		 * Other pre_select functions might have already been called by
-		 * now and decided to do nothing, e.g. because their output
-		 * buffer was full or the input buffer was empty. We just
-		 * converted something which caused these buffers to change but
-		 * we can't make the other tasks reconsider their decision at
-		 * this point.  So force a minimal timeout for the next select
-		 * call to avoid unnecessary delays.
-		 */
-		s->timeout.tv_sec = 0;
-		s->timeout.tv_usec = 1;
-	}
 	if (*fc->input_error >= 0)
 		return;
 	if (*fc->out_loaded)