simplify sched: nuke PRE_EOF_IS_ERROR

[paraslash.git] / write_common.c

diff --git a/write_common.c b/write_common.c
index 2cb0eafd45437d58fd79f988a6757fd41a69d7eb..7622c020024b7545353616f6acdc2431b1e742a5 100644 (file)
--- a/write_common.c
+++ b/write_common.c
@@ -46,7 +46,7 @@ static void wng_post_select(struct sched *s, struct task *t)
        }
        *g->loaded -= min_written;
        if (!*g->loaded && *g->eof)
-               t->ret = 0;
+               t->ret = -E_WNG_EOF;
        else
                t->ret = 1;
        if (*g->loaded && min_written)
@@ -70,7 +70,6 @@ int wng_open(struct writer_node_group *g)
                wn->task.pre_select = wn->writer->pre_select;
                wn->task.post_select = wn->writer->post_select;
                wn->task.private_data = wn;
-               wn->task.flags = POST_EOF_IS_ERROR;
                register_task(&wn->task);
        }
        register_task(&g->task);
@@ -102,7 +101,7 @@ static void wng_error_handler(struct task *t)
 {
        struct writer_node_group *g = t->private_data;
 
-       PARA_INFO_LOG("%p: ret = %d\n", t, t->ret);
+       PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
        unregister_task(t);
        wng_close(g);
        wng_destroy(g);
@@ -118,7 +117,7 @@ struct writer_node_group *wng_new(unsigned num_writers)
        g->task.private_data = g;
        g->task.post_select = wng_post_select;
        g->task.error_handler = wng_error_handler;
-       g->task.flags = POST_ADD_TAIL | POST_EOF_IS_ERROR;
+       g->task.flags = POST_ADD_TAIL;
        return g;
 }
 
@@ -158,6 +157,8 @@ 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\n",
                writer_names[default_writer]);
        return wng;