/** \file filter_common.c Common helper functions for filter input/output. */
+#include <regex.h>
#include <sys/types.h>
#include <dirent.h>
*/
static void close_filter_callback(struct filter_callback *fcb)
{
- PARA_NOTICE_LOG("closing filter_callback %p, data: %p\n", fcb, fcb->data);
+ PARA_NOTICE_LOG("closing filter_callback %p\n", fcb);
list_del(&fcb->node);
fcb->close(fcb);
}
* 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.
+ * registered output callbacks get called.
*
* On errors a (negative) error code is stored in t->error.
*
struct filter *f = filters + fn->filter_num;
if (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->error = f->convert(ib, *loaded, fn);
if (t->error < 0)
return;
call_callbacks(fn, ib, size, fn->buf + old_fn_loaded,
fn->loaded - old_fn_loaded);
*loaded -= size;
- conv += size;
- if (*loaded && size) {
-// PARA_DEBUG_LOG("moving %zd bytes in input "
-// "buffer for %s filter\n",
-// *loaded, fn->filter->name);
+ conv += size + fn->loaded - old_fn_loaded;
+ if (*loaded && size)
memmove(ib, ib + size, *loaded);
- }
}
ib = fn->buf;
loaded = &fn->loaded;
}
conv_total += conv;
-// PARA_DEBUG_LOG("eof (in/out/fc): %d/%d/%d out_loaded: %zd, "
-// "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_total) {
+ /*
+ * Other pre_select functions might have already been called by
+ * now and decided to do nothing, e.g. because their output
+ * buffer was full or the input buffer was empty. We just
+ * converted something which caused these buffers to change but
+ * we can't make the other tasks reconsider their decision at
+ * this point. So force a minimal timeout for the next select
+ * call to avoid unnecessary delays.
+ */
+ s->timeout.tv_sec = 0;
+ s->timeout.tv_usec = 1;
+ }
if (*fc->input_error >= 0)
return;
if (*fc->out_loaded)
if (!f->parse_config)
return strlen(options)? -E_BAD_FILTER_OPTIONS : filter_num;
// PARA_DEBUG_LOG("options: %s\n", options);
- argc = split_args(options, &argv, " \t");
-// PARA_DEBUG_LOG("argc = %d, argv[0]: %s\n", argc, argv[0]);
+ argc = create_argv(options, " \t", &argv);
+ 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);
- argc += 1;
+ argc++;
ret = f->parse_config(argc, argv, conf);
- free(argv[0]);
- free(argv);
+ free(argv[argc - 1]);
+ argv[argc - 1] = NULL;
+ free_argv(argv);
return ret < 0? ret : filter_num;
}