X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_common.c;h=0c92f42c1e4b96760667e63a9dbc65b6dbf2d2a6;hp=ebda1ee74ad265275017d9ebe6eaf137de317fcb;hb=8b280eb4e3b4f46a95eef251520bcce3c761c9ad;hpb=318fbe90e08b6d9c5e781d9b517b670c5a1a04d7

diff --git a/filter_common.c b/filter_common.c
index ebda1ee7..0c92f42c 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);
 }
@@ -67,100 +70,6 @@ static void close_callbacks(struct filter_node *fn)
 	}
 }
 
-static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen,
-	char *outbuf, size_t outlen)
-{
-	struct filter_callback *fcb, *tmp;
-	list_for_each_entry_safe(fcb, tmp, &fn->callbacks, node) {
-		int ret;
-		if (inlen && fcb->input_cb) {
-			ret = fcb->input_cb(inbuf, inlen, fcb);
-			if (ret < 0) {
-				close_filter_callback(fcb);
-				continue;
-			}
-		}
-		if (!outlen || !fcb->output_cb)
-			continue;
-		ret = fcb->output_cb(outbuf, outlen, fcb);
-		if (ret < 0)
-			close_filter_callback(fcb);
-	}
-}
-
-/**
- * Call the convert function of each filter.
- *
- * \param s Unused.
- * \param t The task identifying the filter chain.
- *
- * This is the core function of the filter subsystem. It loops over the list of
- * filter nodes determined by \a t and calls the filter's convert function if
- * there is input available for the filter node in question. If the convert
- * function consumed some or all of its input data, all registered input
- * callbacks are called.  Similarly, if a convert function produced output, all
- * registerd output callbacks get called.
- *
- * On errors a (negative) error code is stored in t->error.
- *
- * \sa filter_node, filter#convert, filter_callback.
- */
-void filter_pre_select(__a_unused struct sched *s, struct task *t)
-{
-	struct filter_chain *fc = container_of(t, struct filter_chain, task);
-	struct filter_node *fn;
-	char *ib;
-	size_t *loaded;
-	int i, conv, conv_total = 0;
-
-	if (fc->output_error && *fc->output_error < 0) {
-		t->error =  *fc->output_error;
-		return;
-	}
-again:
-	ib = *fc->inbufp;
-	loaded = fc->in_loaded;
-	conv = 0;
-	FOR_EACH_FILTER_NODE(fn, fc, i) {
-		struct filter *f = filters + fn->filter_num;
-		if (fn->loaded < fn->bufsize) {
-			size_t size, old_fn_loaded = fn->loaded;
-//			PARA_DEBUG_LOG("fc %p loaded: %zd, calling %s convert\n",
-//				fc, *loaded, fn->filter->name);
-			t->error = f->convert(ib, *loaded, fn);
-			if (t->error < 0)
-				return;
-			size = t->error;
-			call_callbacks(fn, ib, size, fn->buf + old_fn_loaded,
-				fn->loaded - old_fn_loaded);
-			*loaded -= size;
-			conv += size;
-			if (*loaded && size) {
-//				PARA_DEBUG_LOG("moving %zd bytes in input "
-//					"buffer for %s filter\n",
-//					*loaded,  fn->filter->name);
-				memmove(ib, ib + size, *loaded);
-			}
-		}
-		ib = fn->buf;
-		loaded = &fn->loaded;
-	}
-	conv_total += conv;
-//	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;
-	if (*fc->input_error >= 0)
-		return;
-	if (*fc->out_loaded)
-		return;
-	if (*fc->in_loaded && conv_total)
-		return;
-	t->error = -E_FC_EOF;
-}
-
 /**
  * Close all filter nodes and their callbacks.
  *
@@ -186,6 +95,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);
 }
@@ -205,15 +115,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;
 }
 
@@ -279,3 +192,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;
+	}
+}
+