/*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file write_common.c common functions of para_audiod and para_write */
+#include <regex.h>
+
#include "para.h"
#include "string.h"
#include "list.h"
#include "sched.h"
+#include "ggo.h"
#include "write.h"
#include "error.h"
/** the array of supported writers */
struct writer writers[NUM_SUPPORTED_WRITERS] = {WRITER_ARRAY};
-static void wng_pre_select(__a_unused struct sched *s, struct task *t)
+static void wng_pre_select(struct sched *s, struct task *t)
{
- struct writer_node_group *g = t->private_data;
+ struct writer_node_group *g = container_of(t, struct writer_node_group, task);
int i;
FOR_EACH_WRITER_NODE(i, g) {
struct writer_node *wn = &g->writer_nodes[i];
- t->ret = wn->writer->pre_select(s, wn);
- if (t->ret < 0) {
- g->error = t->ret;
+ struct writer *w = writers + wn->writer_num;
+ if (!w->pre_select)
+ continue;
+ t->error = w->pre_select(s, wn);
+ if (t->error < 0)
return;
- }
}
+ /*
+ * Force a minimal delay if something was written during the previous
+ * call to wng_post_select(). This is necessary because the filter
+ * chain might still have data for us which it couldn't convert during
+ * the previous run due to its buffer size constraints. In this case we
+ * do not want to wait until the next input data arrives as this could
+ * lead to buffer underruns.
+ */
+ if (g->last_written == 0)
+ return;
+ s->timeout.tv_sec = 0;
+ s->timeout.tv_usec = 1;
}
static void wng_post_select(struct sched *s, struct task *t)
{
- struct writer_node_group *g = t->private_data;
+ struct writer_node_group *g = container_of(t, struct writer_node_group, task);
int i;
- size_t min_written = 0;
+ size_t min_written = 0, max_written = 0;
FOR_EACH_WRITER_NODE(i, g) {
struct writer_node *wn = &g->writer_nodes[i];
- t->ret = wn->writer->post_select(s, wn);
- if (t->ret < 0) {
- g->error = t->ret;
+ struct writer *w = writers + wn->writer_num;
+ t->error = w->post_select(s, wn);
+ if (t->error < 0)
return;
- }
if (!i)
min_written = wn->written;
else
min_written = PARA_MIN(min_written, wn->written);
+ max_written = PARA_MAX(max_written, wn->written);
}
-// PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_written);
+ g->last_written = max_written;
+ //PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_written);
if (min_written) {
*g->loaded -= min_written;
FOR_EACH_WRITER_NODE(i, g)
g->writer_nodes[i].written -= min_written;
}
if (!*g->loaded && *g->input_error) {
- g->error = *g->input_error;
- t->ret = g->error;
+ t->error = *g->input_error;
return;
}
- t->ret = 1;
if (*g->loaded && min_written) {
// PARA_INFO_LOG("moving %zd bytes\n", *g->loaded);
- memmove(g->buf, g->buf + min_written, *g->loaded);
+ memmove(*g->bufp, *g->bufp + min_written, *g->loaded);
}
}
int i, ret = 1;
PARA_NOTICE_LOG("opening wng %p with %d writer(s)\n", g, g->num_writers);
- register_task(&g->task);
FOR_EACH_WRITER_NODE(i, g) {
struct writer_node *wn = &g->writer_nodes[i];
+ struct writer *w = writers + wn->writer_num;
wn->wng = g;
- ret = wn->writer->open(wn);
+ ret = w->open(wn);
if (ret < 0)
goto err_out;
- wn->chunk_bytes = ret;
- g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret);
}
sprintf(g->task.status, "%s", "writer node group");
- g->error = 0;
+ register_task(&g->task);
+ g->open = 1;
return 1;
err_out:
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
- unregister_task(&g->task);
while (i > 0) {
struct writer_node *wn = &g->writer_nodes[--i];
- wn->writer->close(wn);
+ struct writer *w = writers + wn->writer_num;
+ w->close(wn);
}
+ free(g->writer_nodes);
g->num_writers = 0;
- g->error = ret;
+ g->task.error = -E_TASK_UNREGISTERED;
return ret;
}
-
-/**
- * unregister a writer node group task
- *
- * \param g the group whose task is to be closed
- */
-void wng_unregister(struct writer_node_group *g)
-{
- unregister_task(&g->task);
-}
-
/**
* call the close function of each writer in the given group
*
{
int i;
- if (!g)
+ if (!g || !g->open)
return;
PARA_NOTICE_LOG("closing wng with %d writer(s)\n", g->num_writers);
FOR_EACH_WRITER_NODE(i, g) {
struct writer_node *wn = &g->writer_nodes[i];
- wn->writer->close(wn);
+ struct writer *w = writers + wn->writer_num;
+ w->close(wn);
}
free(g->writer_nodes);
free(g);
g->num_writers = num_writers;
g->writer_nodes = para_calloc(num_writers
* sizeof(struct writer_node));
- g->task.private_data = g;
g->task.post_select = wng_post_select;
g->task.pre_select = wng_pre_select;
return g;
}
/**
- * call the init function of each supported paraslash writer
+ * Call the init function of each supported paraslash writer.
*/
-void init_supported_writers(void)
+void writer_init(void)
{
int i;
struct writer_node_group *setup_default_wng(void)
{
struct writer_node_group *wng = wng_new(1);
- wng->writer_nodes[0].writer = &writers[DEFAULT_WRITER];
+ wng->writer_nodes[0].writer_num = DEFAULT_WRITER;
PARA_INFO_LOG("using default writer: %s %p\n",
writer_names[DEFAULT_WRITER], writers[DEFAULT_WRITER].parse_config);
wng->writer_nodes[0].conf = writers[DEFAULT_WRITER].parse_config("");
return wng;
}
+/**
+ * Print the help text of all writers to stdout.
+ *
+ * \param detailed Whether to print the detailed help text.
+ */
+void print_writer_helps(int detailed)
+{
+ int i;
+
+ printf_or_die("\nAvailable writers: \n\t");
+ FOR_EACH_WRITER(i)
+ printf_or_die("%s%s", i? " " : "", writer_names[i]);
+ printf_or_die("\n\n");
+ FOR_EACH_WRITER(i) {
+ struct writer *w = writers + i;
+
+ if (!w->help.short_help)
+ continue;
+ printf_or_die("Options for %s:\n", writer_names[i]);
+ ggo_print_help(&w->help, detailed);
+ }
+}