projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
audiod: Avoid to report 100% time at startup.
[paraslash.git]
/
filter_common.c
diff --git
a/filter_common.c
b/filter_common.c
index 1233c9ad80ac5c76d8d50c7b52a6abfe0f4a1219..099d056ef1514e2f606adf30d779308b58bead95 100644
(file)
--- a/
filter_common.c
+++ b/
filter_common.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2005
-2011 Andre Noll <maan@systemlinux.org
>
+ * Copyright (C) 2005
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.
*/
@@
-8,7
+8,6
@@
#include <regex.h>
#include <sys/types.h>
#include <regex.h>
#include <sys/types.h>
-#include <stdbool.h>
#include "para.h"
#include "list.h"
#include "para.h"
#include "list.h"
@@
-20,8
+19,18
@@
#include "error.h"
#include "string.h"
#include "error.h"
#include "string.h"
+/** Iterate over the array of supported filters. */
+#define FOR_EACH_SUPPORTED_FILTER(j) for (j = 0; j < NUM_SUPPORTED_FILTERS; j++)
+
/** The array of supported filters. */
/** The array of supported filters. */
-struct filter filters[NUM_SUPPORTED_FILTERS] = {FILTER_ARRAY};
+static struct filter filters[NUM_SUPPORTED_FILTERS] = {FILTER_ARRAY};
+
+const struct filter *filter_get(int filter_num)
+{
+ assert(filter_num >= 0);
+ assert(filter_num < NUM_SUPPORTED_FILTERS);
+ return filters + filter_num;
+}
/**
* Call the init function of each supported filter.
/**
* Call the init function of each supported filter.
@@
-32,7
+41,7
@@
void filter_init(void)
int i;
FOR_EACH_SUPPORTED_FILTER(i)
int i;
FOR_EACH_SUPPORTED_FILTER(i)
- filter
s[i].init(filters + i
);
+ filter
_get(i)->init((struct filter *)filter_get(i)
);
}
/*
}
/*
@@
-41,26
+50,17
@@
void filter_init(void)
*/
static int parse_filter_args(int filter_num, char *options, void **conf)
{
*/
static int parse_filter_args(int filter_num, char *options, void **conf)
{
-
struct filter *f = &filters[filter_num]
;
- int ret,
i, argc = 2
;
+
const struct filter *f = filter_get(filter_num)
;
+ int ret,
argc
;
char **argv;
char **argv;
-// PARA_DEBUG_LOG("%s, options: %s, parser: %p\n", f->name,
-// options? options : "(none)", f->parse_config);
if (!f->parse_config)
return strlen(options)? -E_BAD_FILTER_OPTIONS : filter_num;
if (!f->parse_config)
return strlen(options)? -E_BAD_FILTER_OPTIONS : filter_num;
-// PARA_DEBUG_LOG("options: %s\n", options);
- argc = create_argv(options, " \t", &argv);
+ argc = create_shifted_argv(options, " \t", &argv);
if (argc < 0)
return -E_BAD_FILTER_OPTIONS;
if (argc < 0)
return -E_BAD_FILTER_OPTIONS;
- PARA_DEBUG_LOG("argc = %d, argv[0]: %s\n", argc, argv[0]);
- for (i = argc - 1; i >= 0; i--)
- argv[i + 1] = argv[i];
argv[0] = para_strdup(f->name);
argv[0] = para_strdup(f->name);
- argc++;
ret = f->parse_config(argc, argv, conf);
ret = f->parse_config(argc, argv, conf);
- free(argv[argc - 1]);
- argv[argc - 1] = NULL;
free_argv(argv);
return ret < 0? ret : filter_num;
}
free_argv(argv);
return ret < 0? ret : filter_num;
}
@@
-90,7
+90,7
@@
int check_filter_arg(char *fa, void **conf)
*conf = NULL;
// PARA_DEBUG_LOG("arg: %s\n", fa);
FOR_EACH_SUPPORTED_FILTER(j) {
*conf = NULL;
// PARA_DEBUG_LOG("arg: %s\n", fa);
FOR_EACH_SUPPORTED_FILTER(j) {
- const char *name = filter
s[j].
name;
+ const char *name = filter
_get(j)->
name;
size_t len = strlen(name);
char c;
if (strlen(fa) < len)
size_t len = strlen(name);
char c;
if (strlen(fa) < len)
@@
-100,7
+100,7
@@
int check_filter_arg(char *fa, void **conf)
c = fa[len];
if (c && c != ' ')
continue;
c = fa[len];
if (c && c != ' ')
continue;
- if (c && !filter
s[j].
parse_config)
+ if (c && !filter
_get(j)->
parse_config)
return -E_BAD_FILTER_OPTIONS;
return parse_filter_args(j, c? fa + len + 1 :
fa + strlen(fa), conf);
return -E_BAD_FILTER_OPTIONS;
return parse_filter_args(j, c? fa + len + 1 :
fa + strlen(fa), conf);
@@
-111,43
+111,48
@@
int check_filter_arg(char *fa, void **conf)
/**
* Print help text of each filter to stdout.
*
/**
* Print help text of each filter to stdout.
*
- * \param
detailed If non-zero, print detailed help
.
+ * \param
flags Passed to \ref ggo_print_help()
.
*/
*/
-void print_filter_helps(
int detailed
)
+void print_filter_helps(
unsigned flags
)
{
{
- int i;
+ int i
, num = 0
;
- printf_or_die("\nAvailable filters: \n\t");
- FOR_EACH_SUPPORTED_FILTER(i)
- printf_or_die("%s%s", i? " " : "", filters[i].name);
- printf_or_die("\n\n");
+ printf_or_die("\nAvailable filters: ");
+ FOR_EACH_SUPPORTED_FILTER(i) {
+ if (num > 50) {
+ printf_or_die("\n ");
+ num = 0;
+ }
+ num += printf_or_die("%s%s", i? " " : "", filter_get(i)->name);
+ }
+ printf_or_die("\n");
FOR_EACH_SUPPORTED_FILTER(i) {
FOR_EACH_SUPPORTED_FILTER(i) {
- struct filter *f =
filters + i
;
+ struct filter *f =
(struct filter *)filter_get(i)
;
if (!f->help.short_help)
continue;
if (!f->help.short_help)
continue;
- printf_or_die("Options for %s:\n", f->name);
- ggo_print_help(&f->help, detailed);
+ printf_or_die("\nOptions for %s (%s):", f->name,
+ f->help.purpose);
+ ggo_print_help(&f->help, flags);
}
}
/**
}
}
/**
- * Set select timeout of the
the
scheduler.
+ * Set select timeout of the scheduler.
*
* \param s The scheduler.
*
* \param s The scheduler.
- * \param
t The task struct of this filter
.
+ * \param
context Pointer to the filter node (task context)
.
*
* This looks at the status of the btr node of the filter. If data is available
*
* This looks at the status of the btr node of the filter. If data is available
- * in the input queue of the filter, or if an error occured, a minimal timeout
+ * in the input queue of the filter, or if an error occur
r
ed, a minimal timeout
* for the next select call is requested from the scheduler. Otherwise the
* scheduler timeout is left unchanged.
*/
* for the next select call is requested from the scheduler. Otherwise the
* scheduler timeout is left unchanged.
*/
-void generic_filter_pre_select(struct sched *s,
struct task *
t)
+void generic_filter_pre_select(struct sched *s,
void *contex
t)
{
{
- struct filter_node *fn = cont
ainer_of(t, struct filter_node, task)
;
+ struct filter_node *fn = cont
ext
;
- t->error = 0;
if (btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL) != 0)
sched_min_delay(s);
}
if (btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL) != 0)
sched_min_delay(s);
}