X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_common.c;h=94e553b6e6ae63270cc81fc602b0fd57f1eb67e3;hp=fbc5b66b857d72c730c298737fc7394d2c8c4261;hb=e1c7483ab86de8a2e84c4aa6fc9116faba4ccfcf;hpb=a601afd9c3c5819a0f2361bf073b7c737dcdab45

diff --git a/filter_common.c b/filter_common.c
index fbc5b66b..94e553b6 100644
--- a/filter_common.c
+++ b/filter_common.c
@@ -6,14 +6,17 @@
 
 /** \file filter_common.c Common helper functions for filter input/output. */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
 #include "sched.h"
 #include "fd.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "filter.h"
 #include "error.h"
 #include "string.h"
@@ -105,7 +108,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 +145,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)