paraslash 0.2.14

[paraslash.git] / write_common.c

diff --git a/write_common.c b/write_common.c
index 50784cec6b8b7815c6969eb85b8088e35dd83dd1..acf1d292a4a33ed8ed7ef2649382c9a2c3f4a3e8 100644 (file)
--- a/write_common.c
+++ b/write_common.c
@@ -28,7 +28,22 @@
 const char *writer_names[] ={WRITER_NAMES};
 struct writer writers[NUM_SUPPORTED_WRITERS] = {WRITER_ARRAY};
 
-static void wng_post_select(__a_unused struct sched *s, struct task *t)
+static void wng_pre_select(__a_unused struct sched *s, struct task *t)
+{
+       struct writer_node_group *g = t->private_data;
+       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->eof = 1;
+                       return;
+               }
+       }
+}
+
+static void wng_post_select(struct sched *s, struct task *t)
 {
        struct writer_node_group *g = t->private_data;
        int i;
@@ -36,24 +51,32 @@ static void wng_post_select(__a_unused struct sched *s, struct task *t)
 
        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];
-               t->ret = wn->task.ret;
+               t->ret = wn->writer->post_select(s, wn);
                if (t->ret < 0) {
                        g->eof = 1;
                        return;
                }
                if (!i)
-                       min_written = t->ret;
+                       min_written = wn->written;
                else
-                       min_written = PARA_MIN(min_written, t->ret);
+                       min_written = PARA_MIN(min_written, wn->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;
        }
-       *g->loaded -= min_written;
        if (!*g->loaded && *g->input_eof) {
                g->eof = 1;
                t->ret = -E_WNG_EOF;
-       } else
-               t->ret = 1;
-       if (*g->loaded && min_written)
+               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);
+       }
 }
 
 int wng_open(struct writer_node_group *g)
@@ -61,35 +84,34 @@ 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 out;
+                       goto err_out;
                wn->chunk_bytes = ret;
                g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret);
-               wn->task.pre_select = wn->writer->pre_select;
-               wn->task.post_select = wn->writer->post_select;
-               wn->task.private_data = wn;
-               register_task(&wn->task);
        }
        sprintf(g->task.status, "%s", "writer node group");
        g->eof = 0;
-       register_task(&g->task);
-out:
+       return 1;
+err_out:
+       unregister_task(&g->task);
+       while (i > 0) {
+               struct writer_node *wn = &g->writer_nodes[--i];
+               wn->writer->close(wn);
+       }
+       g->num_writers = 0;
+       g->eof = 1;
        return ret;
 }
 
 void wng_unregister(struct writer_node_group *g)
 {
-       int i;
-
-       FOR_EACH_WRITER_NODE(i, g) {
-               struct writer_node *wn = &g->writer_nodes[i];
-               unregister_task(&wn->task);
-       }
        unregister_task(&g->task);
+       g->eof = 1;
 }
 
 void wng_close(struct writer_node_group *g)
@@ -103,7 +125,6 @@ void wng_close(struct writer_node_group *g)
                struct writer_node *wn = &g->writer_nodes[i];
                wn->writer->close(wn);
        }
-       free(g->written);
        free(g->writer_nodes);
        free(g);
 }
@@ -114,10 +135,9 @@ struct writer_node_group *wng_new(unsigned num_writers)
        g->num_writers = num_writers;
        g->writer_nodes = para_calloc(num_writers
                * sizeof(struct writer_node));
-       g->written = para_calloc(num_writers * sizeof(size_t));
        g->task.private_data = g;
        g->task.post_select = wng_post_select;
-       g->task.flags = POST_ADD_TAIL;
+       g->task.pre_select = wng_pre_select;
        return g;
 }
 
@@ -165,8 +185,6 @@ struct writer_node_group *setup_default_wng(void)
        else
                default_writer = 1;
        wng->writer_nodes[0].writer = &writers[default_writer];
-       sprintf(wng->writer_nodes[0].task.status, "%s",
-               writer_names[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("");