simplify writer node group

[paraslash.git] / write_common.c

diff --git a/write_common.c b/write_common.c
index 4350c9f1730a153a89805cbe75b30508850a8476..d6472027ff018a89e390a6035884ee4520f5508d 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,7 +51,7 @@ 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;
@@ -70,10 +85,6 @@ int wng_open(struct writer_node_group *g)
                        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;
@@ -82,7 +93,6 @@ err_out:
        unregister_task(&g->task);
        while (i > 0) {
                struct writer_node *wn = &g->writer_nodes[--i];
-               unregister_task(&wn->task);
                wn->writer->close(wn);
        }
        g->num_writers = 0;
@@ -92,12 +102,6 @@ err_out:
 
 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;
 }
@@ -127,6 +131,7 @@ struct writer_node_group *wng_new(unsigned num_writers)
        g->written = para_calloc(num_writers * sizeof(size_t));
        g->task.private_data = g;
        g->task.post_select = wng_post_select;
+       g->task.pre_select = wng_pre_select;
        return g;
 }
 
@@ -174,8 +179,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("");