projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server: Convert non-afs commands to lopsub.
[paraslash.git]
/
amp_filter.c
diff --git
a/amp_filter.c
b/amp_filter.c
index 90b5660d835de424be32d13b10ee09c63fb5cf2c..5193d7c166d9345ced27899e38714ddd5d393fcf 100644
(file)
--- a/
amp_filter.c
+++ b/
amp_filter.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2009
-2013 Andre Noll <maan@systemlinux.org
>
+ * Copyright (C) 2009
Andre Noll <maan@tuebingen.mpg.de
>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-34,7
+34,7
@@
static void amp_close(struct filter_node *fn)
static int amp_parse_config(int argc, char **argv, void **config)
{
struct amp_filter_args_info *conf = para_calloc(sizeof(*conf));
static int amp_parse_config(int argc, char **argv, void **config)
{
struct amp_filter_args_info *conf = para_calloc(sizeof(*conf));
- int ret
= -E_AMP_SYNTAX
;
+ int ret;
amp_filter_cmdline_parser(argc, argv, conf);
ret = -ERRNO_TO_PARA_ERROR(EINVAL);
amp_filter_cmdline_parser(argc, argv, conf);
ret = -ERRNO_TO_PARA_ERROR(EINVAL);
@@
-58,13
+58,13
@@
static void amp_open(struct filter_node *fn)
sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp);
else
pad->amp = conf->amp_arg;
sscanf(stat_item_values[SI_AMPLIFICATION], "%u", &pad->amp);
else
pad->amp = conf->amp_arg;
- PARA_
NOTICE
_LOG("amplification: %u (scaling factor: %1.2f)\n",
+ PARA_
INFO
_LOG("amplification: %u (scaling factor: %1.2f)\n",
pad->amp, pad->amp / 64.0 + 1.0);
}
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, void *contex
t)
{
{
- struct filter_node *fn = cont
ainer_of(t, struct filter_node, task)
;
+ struct filter_node *fn = cont
ext
;
struct private_amp_data *pad = fn->private_data;
struct btr_node *btrn = fn->btrn;
int ret, factor = 64 + pad->amp;
struct private_amp_data *pad = fn->private_data;
struct btr_node *btrn = fn->btrn;
int ret, factor = 64 + pad->amp;
@@
-73,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 */
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)
}
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;
btr_merge(btrn, fn->min_iqs);
in_bytes = btr_next_buffer(btrn, (char **)&in);
len = in_bytes / 2;
@@
-110,12
+109,11
@@
next_buffer:
btr_consume(btrn, len * 2);
btr_add_output((char *)out, len * 2, btrn);
}
btr_consume(btrn, len * 2);
btr_add_output((char *)out, len * 2, btrn);
}
- t->error = 0;
goto next_buffer;
err:
assert(ret < 0);
goto next_buffer;
err:
assert(ret < 0);
- t->error = ret;
btr_remove_node(&fn->btrn);
btr_remove_node(&fn->btrn);
+ return ret;
}
static void amp_free_config(void *conf)
}
static void amp_free_config(void *conf)
@@
-139,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->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);
}
}