X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter.c;h=16204393d095d578ea2c363126900aafa44b740b;hp=68c97b45671f64edae5e1b2ef94ed4ddc59fa81e;hb=9ca92b91c68fb59989f317fea5e7c5e36cab7458;hpb=335730538150250f32c0df0b184fb494e2bb0df3

diff --git a/filter.c b/filter.c
index 68c97b45..16204393 100644
--- a/filter.c
+++ b/filter.c
@@ -41,11 +41,13 @@ INIT_STDERR_LOGGING(conf.loglevel_arg);
 
 static void open_filters(void)
 {
+	int i;
 	struct filter_node *fn;
 
-	list_for_each_entry(fn, &fc->filters, node) {
-		fn->filter->open(fn);
-		PARA_INFO_LOG("opened %s filter\n", fn->filter->name);
+	FOR_EACH_FILTER_NODE(fn, fc, i) {
+		struct filter *f = filters + fn->filter_num;
+		f->open(fn);
+		PARA_INFO_LOG("opened %s filter\n", f->name);
 		fc->outbuf = fn->buf;
 		fc->out_loaded = &fn->loaded;
 	}
@@ -53,11 +55,13 @@ static void open_filters(void)
 
 static int init_filter_chain(void)
 {
-	int i, filter_num;
+	int i, ret;
 	struct filter_node *fn;
 
-	INIT_LIST_HEAD(&fc->filters);
-
+	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->inbuf = sit->buf;
 	fc->in_loaded = &sit->loaded;
 	fc->input_error = &sit->task.error;
@@ -66,24 +70,22 @@ static int init_filter_chain(void)
 	fc->task.pre_select = filter_pre_select;
 	sprintf(fc->task.status, "filter chain");
 
-	for (i = 0; i < conf.filter_given; i++) {
+	FOR_EACH_FILTER_NODE(fn, fc, i) {
 		char *fa = conf.filter_arg[i];
-		fn = para_calloc(sizeof(struct filter_node));
-		filter_num = check_filter_arg(fa, &fn->conf);
-		if (filter_num < 0) {
-			free(fn);
-			return filter_num;
-		}
+		fn = fc->filter_nodes + i;
+		ret = check_filter_arg(fa, &fn->conf);
+		if (ret < 0)
+			goto err;
+		fn->filter_num = ret;
 		fn->fc = fc;
 		INIT_LIST_HEAD(&fn->callbacks);
-		fn->filter = &filters[filter_num];
-		PARA_DEBUG_LOG("adding %s to filter chain\n", fn->filter->name);
-		list_add_tail(&fn->node, &fc->filters);
+		PARA_DEBUG_LOG("filter #%d: %s\n", i, filters[fn->filter_num].name);
 	}
-	if (list_empty(&fc->filters))
-		return -E_NO_FILTERS;
 	open_filters();
 	return 1;
+err:
+	free(fc->filter_nodes);
+	return ret;
 }
 
 static int parse_config(int argc, char *argv[])
@@ -136,7 +138,7 @@ static int parse_config(int argc, char *argv[])
 int main(int argc, char *argv[])
 {
 	int ret;
-	struct sched s;
+	static struct sched s;
 
 	stdin_set_defaults(sit);
 	sit->buf = para_malloc(sit->bufsize),
@@ -160,9 +162,9 @@ int main(int argc, char *argv[])
 	s.default_timeout.tv_sec = 1;
 	s.default_timeout.tv_usec = 0;
 	ret = schedule(&s);
+	close_filters(fc);
 out:
 	free(sit->buf);
-	close_filters(fc);
 	if (ret < 0)
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;