simplify sched: nuke PRE_EOF_IS_ERROR

[paraslash.git] / write.c

diff --git a/write.c b/write.c
index 7e6d47a56beb5e827ebbaa7d31cf2560f6b8f49f..3e5a97e8076e9a3d70bbb0d5386ee9b605a4cae7 100644 (file)
--- a/write.c
+++ b/write.c
@@ -74,7 +74,7 @@ static void check_wav_pre_select(struct sched *s, struct task *t)
        cwt->sample_rate = a[24] + (a[25] << 8) + (a[26] << 16) + (a[27] << 24);
        *cwt->loaded -= WAV_HEADER_LEN;
        memmove(cwt->buf, cwt->buf + WAV_HEADER_LEN, *cwt->loaded);
-       t->ret = 0;
+       t->ret = -E_WAV_HEADER_SUCCESS;
        PARA_INFO_LOG("channels: %d, sample_rate: %d\n", cwt->channels, cwt->sample_rate);
 }
 
@@ -83,11 +83,10 @@ static void initial_delay_pre_select(struct sched *s, struct task *t)
        struct initial_delay_task *idt = t->private_data;
        struct timeval diff;
 
-       PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret);
        t->ret = -E_NO_DELAY;
        if (!idt->start_time.tv_sec && !idt->start_time.tv_usec)
                return;
-       t->ret = 0; /* timeout */
+       t->ret = -E_DELAY_TIMEOUT;
        if (tv_diff(&s->now, &idt->start_time, &diff) > 0)
                return;
        t->ret = 1;
@@ -146,6 +145,8 @@ static struct writer_node_group *check_args(void)
                if (ret < 0)
                        goto out;
                wng->writer_nodes[i].writer = &writers[ret];
+               sprintf(wng->writer_nodes[i].task.status, "%s",
+                       writer_names[ret]);
        }
        ret = 1;
 out:
@@ -158,12 +159,14 @@ out:
 
 static void idt_error_handler(struct task *t)
 {
-       PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret);
        int ret;
+
+       PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
        unregister_task(t);
        wng->buf = sit.buf;
        wng->loaded = &sit.loaded;
        wng->eof = &sit.eof;
+       sprintf(wng->task.status, "%s", "writer node group");
        ret = wng_open(wng);
        if (ret < 0) {
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
@@ -173,29 +176,29 @@ static void idt_error_handler(struct task *t)
 
 static void cwt_error_handler(struct task *t)
 {
-       PARA_ERROR_LOG("task %p, ret: %d\n", t, t->ret);
-       if (t->ret < 0) {
+       if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_WAV_HEADER_SUCCESS) {
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
-               if (t->ret != -E_NO_WAV_HEADER && t->ret != -E_PRE_EOF)
-                       exit(EXIT_FAILURE);
-               if (t->ret == -E_PRE_EOF) {
-                       conf.channels_arg = cwt.channels;
-                       conf.sample_rate_arg = cwt.sample_rate;
-               }
+               exit(EXIT_FAILURE);
        }
+       PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
        unregister_task(t);
+       if (t->ret == -E_WAV_HEADER_SUCCESS) {
+               conf.channels_arg = cwt.channels;
+               conf.sample_rate_arg = cwt.sample_rate;
+       }
        idt.task.pre_select = initial_delay_pre_select;
        idt.task.private_data = &idt;
        idt.task.error_handler = idt_error_handler;
-       idt.task.flags = PRE_EOF_IS_ERROR;
+       sprintf(idt.task.status, "initial_delay");
        register_task(&idt.task);
 }
 
 static void stdin_error_handler(struct task *t)
 {
        unregister_task(t);
-       PARA_INFO_LOG("task %p, ret: %d\n", t, t->ret);
-       if (t->ret < 0)
+       if (t->ret != -E_STDIN_EOF)
+               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
+       else
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
 }
 
@@ -217,8 +220,8 @@ int main(int argc, char *argv[])
        sit.task.pre_select = stdin_pre_select;
        sit.task.post_select = stdin_post_select;
        sit.task.error_handler = stdin_error_handler;
-       sit.task.flags = POST_EOF_IS_ERROR;
        sit.task.private_data = &sit;
+       sprintf(sit.task.status, "stdin reader");
        register_task(&sit.task);
 
        cwt.task.pre_select = check_wav_pre_select;
@@ -227,7 +230,7 @@ int main(int argc, char *argv[])
        cwt.buf = sit.buf;
        cwt.loaded = &sit.loaded;
        cwt.eof = &sit.eof;
-       cwt.task.flags = PRE_EOF_IS_ERROR;
+       sprintf(cwt.task.status, "check wav");
        register_task(&cwt.task);
 
        s.default_timeout.tv_sec = 1;