Merge branch 'next'

[paraslash.git] / write_common.c

diff --git a/write_common.c b/write_common.c
index f9560d7f1ee1050439f16459a6fda786647d9250..dcf7bb166ade3f9efa4d04afd4fb55e67e9c2d8e 100644 (file)
--- a/write_common.c
+++ b/write_common.c
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -10,6 +10,7 @@
 #include "string.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "write.h"
 #include "error.h"
 
@@ -60,7 +61,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);
-               memmove(g->buf, g->buf + min_written, *g->loaded);
+               memmove(*g->bufp, *g->bufp + min_written, *g->loaded);
        }
 }
 
@@ -79,21 +80,19 @@ int wng_open(struct writer_node_group *g)
        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];
                wn->wng = g;
                ret = wn->writer->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");
+       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);
@@ -102,17 +101,6 @@ err_out:
        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
  *
@@ -124,7 +112,7 @@ void wng_close(struct writer_node_group *g)
 {
        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) {
@@ -154,9 +142,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;
 
@@ -221,3 +209,21 @@ struct writer_node_group *setup_default_wng(void)
        wng->writer_nodes[0].conf = writers[DEFAULT_WRITER].parse_config("");
        return wng;
 }
+
+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);
+       }
+}