/*
- * 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.
*/
-/** \file filter.c the stand-alone filter program */
+
+/** \file filter.c The stand-alone filter program. */
#include "para.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;
-/** the task that reads from stdin */
+/** The task that reads from stdin. */
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;
-/** the task that filters the data */
+/** The task that filters the data. */
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;
-/** the task that writes converted data to stdout */
+/** The task that writes converted data to stdout. */
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;
-/** 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 filter_event_handler(struct task *t)
-{
- PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
- unregister_task(t);
-}
-
static void open_filters(void)
{
+ int i;
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;
}
static int init_filter_chain(void)
{
- int i, filter_num;
+ int i, ret;
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_eof = &sit->eof;
- fc->eof = 0;
- fc->output_eof = &sot->eof;
- fc->task.private_data = fc;
+ fc->input_error = &sit->task.error;
+ fc->task.error = 0;
+ fc->output_error = &sot->task.error;
fc->task.pre_select = filter_pre_select;
- fc->task.event_handler = filter_event_handler;
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];
- 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->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;
+err:
+ free(fc->filter_nodes);
+ return ret;
}
static int parse_config(int argc, char *argv[])
}
/**
- * para_filter's main function.
+ * The main function of para_filter.
*
- * para_filter reads data from stdin, converts it by using a chain
+ * Para_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.
*
- * \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;
- struct sched s;
+ static struct sched s;
stdin_set_defaults(sit);
sit->buf = para_malloc(sit->bufsize),
stdout_set_defaults(sot);
sot->buf = fc->outbuf;
sot->loaded = fc->out_loaded;
- sot->input_eof = &fc->eof;
+ sot->input_error = &fc->task.error;
register_task(&sit->task);
register_task(&fc->task);
s.default_timeout.tv_sec = 1;
s.default_timeout.tv_usec = 0;
ret = schedule(&s);
+ close_filters(fc);
out:
free(sit->buf);
- close_filters(fc);
if (ret < 0)
- PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
}
projects / paraslash.git / blobdiff