X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=599aaad97815b67c68464c094866ce4d1bd6e5a4;hp=4113690439184012724c33908ae535e23c29b12a;hb=c282c836791cedf57c128555af90af37c7c01c05;hpb=a37e903213215dd36b11bbde4ea98e1d4590a472

diff --git a/filter.c b/filter.c
index 41136904..599aaad9 100644
--- a/filter.c
+++ b/filter.c
@@ -7,12 +7,14 @@
 /** \file filter.c The stand-alone filter program. */
 
 #include <regex.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "filter.h"
 #include "string.h"
 #include "stdin.h"
@@ -62,6 +64,15 @@ static void open_filters(void)
 	}
 }
 
+static void free_filter_confs(void)
+{
+	int i;
+	struct filter_node *fn;
+
+	FOR_EACH_FILTER_NODE(fn, fc, i)
+		free(fn->conf);
+}
+
 static int init_filter_chain(void)
 {
 	int i, ret;
@@ -70,13 +81,13 @@ static int init_filter_chain(void)
 	if (!conf.filter_given)
 		return -E_NO_FILTERS;
 	fc->num_filters = conf.filter_given;
-	fc->filter_nodes = para_malloc(fc->num_filters * sizeof(struct filter_node));
+	fc->filter_nodes = para_calloc(fc->num_filters * sizeof(struct filter_node));
 	fc->inbufp = &sit->buf;
 	fc->in_loaded = &sit->loaded;
 	fc->input_error = &sit->task.error;
 	fc->task.error = 0;
 	fc->output_error = &sot->task.error;
-	fc->task.pre_select = filter_pre_select;
+	fc->task.post_select = filter_post_select;
 	sprintf(fc->task.status, "filter chain");
 
 	FOR_EACH_FILTER_NODE(fn, fc, i) {
@@ -93,6 +104,7 @@ static int init_filter_chain(void)
 	open_filters();
 	return 1;
 err:
+	free_filter_confs();
 	free(fc->filter_nodes);
 	return ret;
 }
@@ -122,6 +134,7 @@ static int parse_config(int argc, char *argv[])
 	HANDLE_VERSION_FLAG("filter", conf);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	if (!cf) {
 		char *home = para_homedir();
 		cf = make_message("%s/.paraslash/filter.conf", home);
@@ -132,7 +145,8 @@ static int parse_config(int argc, char *argv[])
 			.override = 0,
 			.initialize = 0,
 			.check_required = 0,
-			.check_ambiguity = 0
+			.check_ambiguity = 0,
+			.print_errors = 1
 		};
 		if (filter_cmdline_parser_config_file(cf, &conf, &params))
 			return -E_FILTER_SYNTAX;
@@ -140,6 +154,67 @@ static int parse_config(int argc, char *argv[])
 	return 1;
 }
 
+/* TODO: support buffer tree, not just a chain. */
+static int __noreturn main_btr(void)
+{
+	static struct sched s;
+	int i, ret;
+	struct filter *f;
+	struct btr_node *parent;
+	struct filter_node **fns;
+
+	sit->btrn = btr_new_node("stdin", NULL, NULL, NULL);
+	stdin_set_defaults(sit);
+	register_task(&sit->task);
+
+	fns = para_malloc(conf.filter_given * sizeof(*fns));
+	for (i = 0, parent = sit->btrn; i < conf.filter_given; i++) {
+		char *fa = conf.filter_arg[i];
+		struct filter_node *fn;
+
+		fn = fns[i] = para_calloc(sizeof(*fn));
+		ret = check_filter_arg(fa, &fn->conf);
+		if (ret < 0) {
+			free(fn);
+			goto out;
+		}
+		fn->filter_num = ret;
+		f = filters + fn->filter_num;
+		sprintf(fn->task.status, "%s", f->name);
+		PARA_DEBUG_LOG("filter #%d: %s\n", i, f->name);
+		fn->btrn = btr_new_node(f->name, parent, f->execute, fn);
+		fn->task.pre_select = f->pre_select;
+		fn->task.post_select = f->post_select;
+		f->open(fn);
+		register_task(&fn->task);
+		parent = fn->btrn;
+	}
+	sot->btrn = btr_new_node("stdout", parent, NULL, NULL);
+	stdout_set_defaults(sot);
+	register_task(&sot->task);
+
+	s.default_timeout.tv_sec = 1;
+	s.default_timeout.tv_usec = 0;
+	btr_log_tree(sit->btrn, LL_INFO);
+	ret = schedule(&s);
+out:
+	for (i--; i >= 0; i--) {
+		struct filter_node *fn = fns[i];
+
+		f = filters + fn->filter_num;
+		f->close(fn);
+		btr_free_node(fn->btrn);
+		free(fn->conf);
+		free(fn);
+	}
+	free(fns);
+	btr_free_node(sit->btrn);
+	btr_free_node(sot->btrn);
+	if (ret < 0)
+		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+	exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS);
+}
+
 /**
  * The main function of para_filter.
  *
@@ -157,14 +232,17 @@ int main(int argc, char *argv[])
 	int ret;
 	static struct sched s;
 
-	stdin_set_defaults(sit);
-	sit->buf = para_malloc(sit->bufsize),
-
 	filter_init();
 	ret = parse_config(argc, argv);
 	if (ret < 0)
 		goto out;
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
+	if (conf.buffer_tree_given) {
+		ret = main_btr();
+		goto out;
+	}
+	stdin_set_defaults(sit);
+	sit->buf = para_malloc(sit->bufsize),
+
 	ret = init_filter_chain();
 	if (ret < 0)
 		goto out;
@@ -176,8 +254,8 @@ int main(int argc, char *argv[])
 	sot->input_error = &fc->task.error;
 
 	register_task(&sit->task);
-	register_task(&fc->task);
 	register_task(&sot->task);
+	register_task(&fc->task);
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
 	ret = schedule(&s);