projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stdin: Abort if the consumer terminates.
[paraslash.git]
/
filter.c
diff --git
a/filter.c
b/filter.c
index 68c97b45671f64edae5e1b2ef94ed4ddc59fa81e..adfadea7733d01862d1a767504e298f7d601ffa8 100644
(file)
--- a/
filter.c
+++ b/
filter.c
@@
-3,7
+3,8
@@
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
-/** \file filter.c the stand-alone filter program */
+
+/** \file filter.c The stand-alone filter program. */
#include "para.h"
#include "para.h"
@@
-16,36
+17,43
@@
#include "stdout.h"
#include "error.h"
#include "stdout.h"
#include "error.h"
-/** init the array of errors for para_filter */
+/** The list of all status items used by para_{server,audiod,gui}. */
+const char *status_item_list[] = {STATUS_ITEM_ARRAY};
+
+char *stat_item_values[NUM_STAT_ITEMS] = {NULL};
+
+/** Initialize the array of errors for para_filter. */
INIT_FILTER_ERRLISTS;
INIT_FILTER_ERRLISTS;
-/**
the task that reads from stdin
*/
+/**
The task that reads from stdin.
*/
static struct stdin_task stdin_task_struct;
static struct stdin_task stdin_task_struct;
-/** pointer to the stdin task */
+/** pointer to the stdin task
.
*/
static struct stdin_task *sit = &stdin_task_struct;
static struct stdin_task *sit = &stdin_task_struct;
-/**
the task that filters the data
*/
+/**
The task that filters the data.
*/
static struct filter_chain filter_chain_struct;
static struct filter_chain filter_chain_struct;
-/**
pointer to the filter chain
*/
+/**
Pointer to the filter chain.
*/
static struct filter_chain *fc = &filter_chain_struct;
static struct filter_chain *fc = &filter_chain_struct;
-/**
the task that writes converted data to stdout
*/
+/**
The task that writes converted data to stdout.
*/
static struct stdout_task stdout_task_struct;
static struct stdout_task stdout_task_struct;
-/**
pointer to the stdout task
*/
+/**
Pointer to the stdout task.
*/
static struct stdout_task *sot = &stdout_task_struct;
static struct stdout_task *sot = &stdout_task_struct;
-/**
gengetopt struct that holds the command line args
*/
+/**
Gengetopt struct that holds the command line args.
*/
static struct filter_args_info conf;
INIT_STDERR_LOGGING(conf.loglevel_arg);
static void open_filters(void)
{
static struct filter_args_info conf;
INIT_STDERR_LOGGING(conf.loglevel_arg);
static void open_filters(void)
{
+ int i;
struct filter_node *fn;
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;
}
fc->outbuf = fn->buf;
fc->out_loaded = &fn->loaded;
}
@@
-53,11
+61,13
@@
static void open_filters(void)
static int init_filter_chain(void)
{
static int init_filter_chain(void)
{
- int i,
filter_num
;
+ int i,
ret
;
struct filter_node *fn;
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;
fc->inbuf = sit->buf;
fc->in_loaded = &sit->loaded;
fc->input_error = &sit->task.error;
@@
-66,24
+76,22
@@
static int init_filter_chain(void)
fc->task.pre_select = filter_pre_select;
sprintf(fc->task.status, "filter chain");
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];
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->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;
open_filters();
return 1;
+err:
+ free(fc->filter_nodes);
+ return ret;
}
static int parse_config(int argc, char *argv[])
}
static int parse_config(int argc, char *argv[])
@@
-122,21
+130,21
@@
static int parse_config(int argc, char *argv[])
}
/**
}
/**
- *
para_filter's main function
.
+ *
The main function of para_filter
.
*
*
- *
p
ara_filter reads data from stdin, converts it by using a chain
+ *
P
ara_filter reads data from stdin, converts it by using a chain
* of filters (specified on the command line) and writes the resulting
* data to stdout.
*
* of filters (specified on the command line) and writes the resulting
* data to stdout.
*
- * \param argc
number of command line options
- * \param argv
vector of arguments
+ * \param argc
Number of command line options.
+ * \param argv
Vector of arguments.
*
* \return \a EXIT_SUCCESS on success, EXIT_FAILURE on errors.
*/
int main(int argc, char *argv[])
{
int ret;
*
* \return \a EXIT_SUCCESS on success, EXIT_FAILURE on errors.
*/
int main(int argc, char *argv[])
{
int ret;
- struct sched s;
+ st
atic st
ruct sched s;
stdin_set_defaults(sit);
sit->buf = para_malloc(sit->bufsize),
stdin_set_defaults(sit);
sit->buf = para_malloc(sit->bufsize),
@@
-148,6
+156,7
@@
int main(int argc, char *argv[])
ret = init_filter_chain();
if (ret < 0)
goto out;
ret = init_filter_chain();
if (ret < 0)
goto out;
+ sit->output_error = &fc->task.error;
stdout_set_defaults(sot);
sot->buf = fc->outbuf;
stdout_set_defaults(sot);
sot->buf = fc->outbuf;
@@
-160,9
+169,9
@@
int main(int argc, char *argv[])
s.default_timeout.tv_sec = 1;
s.default_timeout.tv_usec = 0;
ret = schedule(&s);
s.default_timeout.tv_sec = 1;
s.default_timeout.tv_usec = 0;
ret = schedule(&s);
+ close_filters(fc);
out:
free(sit->buf);
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;
if (ret < 0)
PARA_EMERG_LOG("%s\n", para_strerror(-ret));
return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;