X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_common.c;h=7fa30803d6c02a87699b3cc927e0c8b7966e36c9;hp=1b02e1cdfbd1c106ae8ec69125af108ae24b8d8f;hb=7991d2871340f773ad7d0e819491fe905b184a5c;hpb=0981b6cfe49fedf9855e42bbde1f81a89c6a4ea1

diff --git a/filter_common.c b/filter_common.c
index 1b02e1cd..7fa30803 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"
@@ -43,7 +46,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 +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)
@@ -189,6 +179,7 @@ void close_filters(struct filter_chain *fc)
 		close_callbacks(fn);
 		PARA_INFO_LOG("closing %s filter\n", f->name);
 		f->close(fn);
+		free(fn->conf);
 	}
 	free(fc->filter_nodes);
 }
@@ -208,15 +199,18 @@ static int parse_filter_args(int filter_num, char *options, void **conf)
 	if (!f->parse_config)
 		return strlen(options)? -E_BAD_FILTER_OPTIONS : filter_num;
 //	PARA_DEBUG_LOG("options: %s\n", options);
-	argc = split_args(options, &argv, " \t");
-//		PARA_DEBUG_LOG("argc = %d, argv[0]: %s\n", argc, argv[0]);
+	argc = create_argv(options, " \t", &argv);
+	if (argc < 0)
+		return -E_BAD_FILTER_OPTIONS;
+	PARA_DEBUG_LOG("argc = %d, argv[0]: %s\n", argc, argv[0]);
 	for (i = argc - 1; i >= 0; i--)
 		argv[i + 1] = argv[i];
 	argv[0] = para_strdup(f->name);
-	argc += 1;
+	argc++;
 	ret = f->parse_config(argc, argv, conf);
-	free(argv[0]);
-	free(argv);
+	free(argv[argc - 1]);
+	argv[argc - 1] = NULL;
+	free_argv(argv);
 	return ret < 0? ret : filter_num;
 }
 
@@ -282,3 +276,15 @@ void print_filter_helps(int detailed)
 	}
 
 }
+
+void generic_filter_pre_select(struct sched *s, struct task *t)
+{
+	struct filter_node *fn = container_of(t, struct filter_node, task);
+
+	t->error = 0;
+	if (btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL) != 0) {
+		s->timeout.tv_sec = 0;
+		s->timeout.tv_usec = 1;
+	}
+}
+