/*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
list_for_each_entry_safe(fcb, tmp, &fn->callbacks, node) {
PARA_INFO_LOG("closing %s filter callback\n",
- fn->filter->name);
+ filters[fn->filter_num].name);
close_filter_callback(fcb);
}
}
*/
void filter_pre_select(__a_unused struct sched *s, struct task *t)
{
- struct filter_chain *fc = t->private_data;
+ struct filter_chain *fc = container_of(t, struct filter_chain, task);
struct filter_node *fn;
char *ib;
size_t *loaded;
- int conv, conv_total = 0;
+ int i, conv, conv_total = 0;
- t->ret = -E_FC_EOF;
- if (fc->output_eof && *fc->output_eof)
- goto err_out;
+ if (fc->output_error && *fc->output_error < 0) {
+ t->error = *fc->output_error;
+ return;
+ }
again:
ib = fc->inbuf;
loaded = fc->in_loaded;
conv = 0;
- list_for_each_entry(fn, &fc->filters, node) {
+ FOR_EACH_FILTER_NODE(fn, fc, i) {
+ struct filter *f = filters + fn->filter_num;
if (*loaded && 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->ret = fn->filter->convert(ib, *loaded, fn);
- if (t->ret < 0)
- goto err_out;
- size = t->ret;
+ 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;
// fc->eof, *fc->out_loaded, conv, conv_total);
if (conv)
goto again;
- t->ret = 1;
- if (!*fc->input_eof)
+ if (!*fc->input_error)
return;
if (*fc->out_loaded)
return;
if (*fc->in_loaded && conv_total)
return;
- t->ret = -E_FC_EOF;
-err_out:
- fc->eof = 1;
+ t->error = -E_FC_EOF;
}
/**
*/
void close_filters(struct filter_chain *fc)
{
- struct filter_node *fn, *tmp;
+ struct filter_node *fn;
+ int i;
if (!fc)
return;
PARA_NOTICE_LOG("closing filter chain %p\n", fc);
- list_for_each_entry_safe(fn, tmp, &fc->filters, node) {
+ FOR_EACH_FILTER_NODE(fn, fc, i) {
+ struct filter *f = filters + fn->filter_num;
close_callbacks(fn);
- PARA_INFO_LOG("closing %s filter\n", fn->filter->name);
- fn->filter->close(fn);
- list_del(&fn->node);
- free(fn);
+ PARA_INFO_LOG("closing %s filter\n", f->name);
+ f->close(fn);
}
+ free(fc->filter_nodes);
}
/*