projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
audioc: kill unused --timeout option
[paraslash.git]
/
filter_chain.c
diff --git
a/filter_chain.c
b/filter_chain.c
index d755e43483c385a419d84d625076438a4ed9211b..2d82a22c1c890865fa5d5c5c541b133872ed2471 100644
(file)
--- a/
filter_chain.c
+++ b/
filter_chain.c
@@
-20,6
+20,8
@@
#include "para.h"
#include "list.h"
#include "para.h"
#include "list.h"
+#include "sched.h"
+#include "fd.h"
#include "filter.h"
#include "error.h"
#include "string.h"
#include "filter.h"
#include "error.h"
#include "string.h"
@@
-67,8
+69,11
@@
static void close_callbacks(struct filter_node *fn)
{
struct filter_callback *fcb, *tmp;
{
struct filter_callback *fcb, *tmp;
- list_for_each_entry_safe(fcb, tmp, &fn->callbacks, node)
+ list_for_each_entry_safe(fcb, tmp, &fn->callbacks, node) {
+ PARA_INFO_LOG("closing %s filter callback\n",
+ fn->filter->name);
close_filter_callback(fcb);
close_filter_callback(fcb);
+ }
}
static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen,
}
static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen,
@@
-95,60
+100,75
@@
static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen,
/**
* call the convert function of each filter
*
/**
* call the convert function of each filter
*
- * \param fc the filter chain containing the list of filter nodes.
- *
* This is the core function of the filter subsystem. It loops over the list of
* This is the core function of the filter subsystem. It loops over the list of
- * filter nodes determined by \a
fc
and calls the filter's convert function if
+ * filter nodes determined by \a
t
and calls the filter's convert function if
* there is input available for the filter node in question. If the convert
* function consumed some or all of its input data, all registered input
* callbacks are called. Similarly, if a convert function produced output, all
* registerd output callbacks get called.
*
* there is input available for the filter node in question. If the convert
* function consumed some or all of its input data, all registered input
* callbacks are called. Similarly, if a convert function produced output, all
* registerd output callbacks get called.
*
- * \return The sum of output bytes produced by the convert functions on success,
- * negative return value on errors.
+ * \return The sum of output bytes produced by the convert functions on
+ * success, negative return value on errors (the return value is stored in
+ * t->ret).
*
* \sa filter_node, filter#convert, filter_callback
*/
*
* \sa filter_node, filter#convert, filter_callback
*/
-
int filter_io(struct filter_chain *fc
)
+
void filter_pre_select(__a_unused struct sched *s, struct task *t
)
{
{
+ struct filter_chain *fc = t->private_data;
struct filter_node *fn;
char *ib;
size_t *loaded;
int conv, conv_total = 0;
struct filter_node *fn;
char *ib;
size_t *loaded;
int conv, conv_total = 0;
+
+ t->ret = -E_FC_EOF;
+ if (fc->output_eof && *fc->output_eof)
+ goto err_out;
+ if (fc->input_eof && *fc->input_eof && !*fc->in_loaded)
+ goto err_out;
again:
ib = fc->inbuf;
loaded = fc->in_loaded;
conv = 0;
list_for_each_entry(fn, &fc->filters, node) {
again:
ib = fc->inbuf;
loaded = fc->in_loaded;
conv = 0;
list_for_each_entry(fn, &fc->filters, node) {
- int ret;
if (*loaded && fn->loaded < fn->bufsize) {
size_t old_fn_loaded = fn->loaded;
PARA_DEBUG_LOG("fc %p loaded: %zd, calling %s convert\n",
fc, *loaded, fn->filter->name);
if (*loaded && fn->loaded < fn->bufsize) {
size_t old_fn_loaded = fn->loaded;
PARA_DEBUG_LOG("fc %p loaded: %zd, calling %s convert\n",
fc, *loaded, fn->filter->name);
- ret = fn->filter->convert(ib, *loaded, fn);
- if (ret < 0) {
- if (!fc->error)
- fc->error = -ret;
- return ret;
- }
- call_callbacks(fn, ib, ret, fn->buf + old_fn_loaded,
+ t->ret = fn->filter->convert(ib, *loaded, fn);
+ if (t->ret < 0)
+ goto err_out;
+ call_callbacks(fn, ib, t->ret, fn->buf + old_fn_loaded,
fn->loaded - old_fn_loaded);
fn->loaded - old_fn_loaded);
- *loaded -= ret;
- conv += ret;
- if (*loaded && ret) {
- PARA_DEBUG_LOG("moving %zd bytes in input buffer for %s filter\n",
+ *loaded -= t->ret;
+ conv += t->ret;
+ if (*loaded && t->ret) {
+ PARA_DEBUG_LOG("moving %zd bytes in input "
+ "buffer for %s filter\n",
*loaded, fn->filter->name);
*loaded, fn->filter->name);
- memmove(ib, ib + ret, *loaded);
+ memmove(ib, ib +
t->
ret, *loaded);
}
}
ib = fn->buf;
loaded = &fn->loaded;
}
}
}
ib = fn->buf;
loaded = &fn->loaded;
}
-// PARA_DEBUG_LOG("loaded: %d\n", *loaded);
conv_total += conv;
conv_total += conv;
+ PARA_DEBUG_LOG("eof (in/out/fc): %d/%d/%d out_loaded: %d, "
+ "conv: %d, conv_total: %d\n", *fc->input_eof,
+ fc->output_eof? *fc->output_eof : -42,
+ fc->eof, *fc->out_loaded, conv, conv_total);
if (conv)
goto again;
if (conv)
goto again;
- return conv_total;
+ t->ret = 1;
+ if (!*fc->input_eof)
+ return;
+ if (*fc->out_loaded)
+ return;
+ if (*fc->in_loaded && conv_total)
+ return;
+ t->ret = -E_FC_EOF;
+err_out:
+ fc->eof = 1;
}
/**
}
/**
@@
-169,11
+189,10
@@
void close_filters(struct filter_chain *fc)
if (!fc)
return;
if (!fc)
return;
- PARA_
DEBUG
_LOG("closing filter chain %p\n", fc);
+ PARA_
NOTICE
_LOG("closing filter chain %p\n", fc);
list_for_each_entry_safe(fn, tmp, &fc->filters, node) {
list_for_each_entry_safe(fn, tmp, &fc->filters, node) {
- PARA_NOTICE_LOG("closing %s filter callbacks (fc %p, fn %p)\n", fn->filter->name, fc, fn);
close_callbacks(fn);
close_callbacks(fn);
- PARA_
NOTICE_LOG("closing %s filter (fc %p, fn %p)\n", fn->filter->name, fc, fn
);
+ PARA_
INFO_LOG("closing %s filter\n", fn->filter->name
);
fn->filter->close(fn);
list_del(&fn->node);
free(fn);
fn->filter->close(fn);
list_del(&fn->node);
free(fn);