buffer_tree: Add code to splice out a node of the buffer tree.

[paraslash.git] / write_common.c

diff --git a/write_common.c b/write_common.c
index d66b20ca112dd7cb1135d9211ff880cd2a2fc39c..3f6c0bbea422bbbc44e16857000b78df6d45a5d8 100644 (file)
--- a/write_common.c
+++ b/write_common.c
@@ -1,11 +1,13 @@
 /*
 /*

- * 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 */
 
  *
  * 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 "para.h"
 #include "string.h"
 #include "list.h"


@@ -20,35 +22,53 @@ const char *writer_names[] ={WRITER_NAMES};
 /** the array of supported writers */
 struct writer writers[NUM_SUPPORTED_WRITERS] = {WRITER_ARRAY};
 
 /** 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 = container_of(t, struct writer_node_group, task);
        int i;
 
        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];
 {
        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->error = wn->writer->pre_select(s, wn);
+               struct writer *w = writers + wn->writer_num;
+               if (!w->pre_select)
+                       continue;
+               t->error = w->pre_select(s, wn);

                if (t->error < 0)
                        return;
        }
                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 = container_of(t, struct writer_node_group, task);
        int i;
 }
 
 static void wng_post_select(struct sched *s, struct task *t)
 {
        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];
 
        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];

-               t->error = wn->writer->post_select(s, wn);
+               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);
                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);

        }
        }

+       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;
        //PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_written);
        if (min_written) {
                *g->loaded -= min_written;


@@ -61,7 +81,7 @@ static void wng_post_select(struct sched *s, struct task *t)
        }
        if (*g->loaded && min_written) {
 //             PARA_INFO_LOG("moving %zd bytes\n", *g->loaded);
        }
        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);

        }
 }
 
        }
 }
 


@@ -82,12 +102,11 @@ int wng_open(struct writer_node_group *g)
        PARA_NOTICE_LOG("opening wng %p with %d writer(s)\n", g, g->num_writers);
        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];
        PARA_NOTICE_LOG("opening wng %p with %d writer(s)\n", g, g->num_writers);
        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];

+               struct writer *w = writers + wn->writer_num;

                wn->wng = g;
                wn->wng = g;

-               ret = wn->writer->open(wn);
+               ret = w->open(wn);

                if (ret < 0)
                        goto err_out;
                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");
        register_task(&g->task);
        }
        sprintf(g->task.status, "%s", "writer node group");
        register_task(&g->task);


@@ -97,9 +116,12 @@ err_out:
        PARA_ERROR_LOG("%s\n", para_strerror(-ret));
        while (i > 0) {
                struct writer_node *wn = &g->writer_nodes[--i];
        PARA_ERROR_LOG("%s\n", para_strerror(-ret));
        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->num_writers = 0;

+       g->task.error = -E_TASK_UNREGISTERED;

        return ret;
 }
 
        return ret;
 }
 


@@ -119,7 +141,8 @@ void wng_close(struct writer_node_group *g)
        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];
        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);
        }
        free(g->writer_nodes);
        free(g);


@@ -144,9 +167,9 @@ struct writer_node_group *wng_new(unsigned num_writers)
 }
 
 /**
 }
 
 /**

- * 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;
 
 {
        int i;
 


@@ -205,9 +228,31 @@ void *check_writer_arg(const char *wa, int *writer_num)
 struct writer_node_group *setup_default_wng(void)
 {
        struct writer_node_group *wng = wng_new(1);
 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;
 }
        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);
+       }
+}