X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=amp_filter.c;h=c3e55cf0477b253dfd663953613c2ed5f95daa51;hp=dd2c61949da4877a88ef4ca468fb6bf4be7e6b7e;hb=bd10c0f46e0b7eadfb8c6d5cd45581cec253d775;hpb=35e284e06a5c8e20d02b61fdcb4bcc20b237c1e4

diff --git a/amp_filter.c b/amp_filter.c
index dd2c6194..c3e55cf0 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -22,8 +22,6 @@ extern char *stat_item_values[NUM_STAT_ITEMS];
 
 /** Data specific to the amplify filter. */
 struct private_amp_data {
-	/** Points to the configuration data for this instance of this filter. */
-	struct amp_filter_args_info *conf;
 	/** Amplification factor. */
 	unsigned amp;
 };
@@ -35,37 +33,36 @@ static void amp_close(struct filter_node *fn)
 
 static int amp_parse_config(int argc, char **argv, void **config)
 {
-	struct amp_filter_args_info *amp_conf = para_calloc(sizeof(*amp_conf));
+	struct amp_filter_args_info *conf = para_calloc(sizeof(*conf));
 	int ret = -E_AMP_SYNTAX;
 
-	if (amp_filter_cmdline_parser(argc, argv, amp_conf))
-		goto err;
+	amp_filter_cmdline_parser(argc, argv, conf);
 	ret = -ERRNO_TO_PARA_ERROR(EINVAL);
-	if (amp_conf->amp_arg < 0)
+	if (conf->amp_arg < 0)
 		goto err;
-	*config = amp_conf;
+	*config = conf;
 	return 1;
 err:
-	free(amp_conf);
+	free(conf);
 	return ret;
 }
 
 static void amp_open(struct filter_node *fn)
 {
 	struct private_amp_data *pad = para_calloc(sizeof(*pad));
+	struct amp_filter_args_info *conf = fn->conf;
 
-	pad->conf = fn->conf;
 	fn->private_data = pad;
 	fn->min_iqs = 2;
-	if (!pad->conf->amp_given && stat_item_values[SI_AMPLIFICATION])
+	if (!conf->amp_given && stat_item_values[SI_AMPLIFICATION])
 		sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp);
 	else
-		pad->amp = pad->conf->amp_arg;
-	PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n",
+		pad->amp = conf->amp_arg;
+	PARA_INFO_LOG("amplification: %u (scaling factor: %1.2f)\n",
 		pad->amp, pad->amp / 64.0 + 1.0);
 }
 
-static void amp_post_select(__a_unused struct sched *s, struct task *t)
+static int amp_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
 	struct private_amp_data *pad = fn->private_data;
@@ -76,16 +73,15 @@ static void amp_post_select(__a_unused struct sched *s, struct task *t)
 	bool inplace = btr_inplace_ok(btrn);
 
 	if (pad->amp == 0) { /* no amplification */
-		t->error = -E_AMP_ZERO_AMP;
-		btr_splice_out_node(btrn);
-		return;
+		btr_splice_out_node(&fn->btrn);
+		return -E_AMP_ZERO_AMP;
 	}
 next_buffer:
 	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (ret < 0)
 		goto err;
 	if (ret == 0)
-		return;
+		return 0;
 	btr_merge(btrn, fn->min_iqs);
 	in_bytes = btr_next_buffer(btrn, (char **)&in);
 	len = in_bytes / 2;
@@ -113,12 +109,11 @@ next_buffer:
 		btr_consume(btrn, len * 2);
 		btr_add_output((char *)out, len * 2, btrn);
 	}
-	t->error = 0;
 	goto next_buffer;
 err:
 	assert(ret < 0);
-	t->error = ret;
 	btr_remove_node(&fn->btrn);
+	return ret;
 }
 
 static void amp_free_config(void *conf)
@@ -142,8 +137,5 @@ void amp_filter_init(struct filter *f)
 	f->post_select = amp_post_select;
 	f->parse_config = amp_parse_config;
 	f->free_config = amp_free_config;
-	f->help = (struct ggo_help) {
-		.short_help = amp_filter_args_info_help,
-		.detailed_help = amp_filter_args_info_detailed_help
-	};
+	f->help = (struct ggo_help)DEFINE_GGO_HELP(amp_filter);
 }