check_wav: return error on premature end of file.

[paraslash.git] / write_common.c

diff --git a/write_common.c b/write_common.c
index e496c26ca7c547fe185e5f7df1156c230bcaaec1..2cb0eafd45437d58fd79f988a6757fd41a69d7eb 100644 (file)
--- a/write_common.c
+++ b/write_common.c
@@ -20,55 +20,37 @@
 
 #include "para.h"
 #include "string.h"
+#include "list.h"
+#include "sched.h"
 #include "write.h"
 #include "error.h"
 
 const char *writer_names[] ={WRITER_NAMES};
 struct writer writers[NUM_SUPPORTED_WRITERS] = {WRITER_ARRAY};
 
-int wng_write(struct writer_node_group *g, char *buf, size_t *loaded)
+static void wng_post_select(struct sched *s, struct task *t)
 {
-       int ret, i, need_more_writes = 1;
+       struct writer_node_group *g = t->private_data;
+       int i;
        size_t min_written = 0;
 
-       while (need_more_writes) {
-               need_more_writes = 0;
-               FOR_EACH_WRITER_NODE(i, g) {
-                       size_t w = g->written[i];
-                       unsigned char *p = buf + w;
-                       int bytes_to_write;
-                       struct writer_node *wn = &g->writer_nodes[i];
-                       if (!i)
-                               min_written = w;
-                       else
-                               min_written = PARA_MIN(min_written, w);
-                       if (w == *loaded)
-                               continue;
-                       if (!g->eof && (*loaded < wn->chunk_bytes + w))
-                               continue;
-                       bytes_to_write = PARA_MIN(wn->chunk_bytes,
-                               *loaded - w);
-                       ret = wn->writer->write(p, bytes_to_write, wn);
-                       if (ret < 0)
-                               goto out;
-                       if (ret != bytes_to_write)
-                               PARA_WARNING_LOG("short write: %d/%d\n", ret,
-                                       bytes_to_write);
-                       g->written[i] += ret;
-                       need_more_writes = 1;
-               }
+       FOR_EACH_WRITER_NODE(i, g) {
+               struct writer_node *wn = &g->writer_nodes[i];
+               t->ret = wn->task.ret;
+               if (t->ret < 0)
+                       return;
+               if (!i)
+                       min_written = t->ret;
+               else
+                       min_written = PARA_MIN(min_written, t->ret);
        }
-       *loaded -= min_written;
-       ret = 0;
-       if (g->eof)
-               goto out;
-       if (*loaded)
-               memmove(buf, buf + min_written, *loaded);
-       FOR_EACH_WRITER_NODE(i, g)
-               g->written[i] -= min_written;
-       ret = 1;
-out:
-       return ret;
+       *g->loaded -= min_written;
+       if (!*g->loaded && *g->eof)
+               t->ret = 0;
+       else
+               t->ret = 1;
+       if (*g->loaded && min_written)
+               memmove(g->buf, g->buf + min_written, *g->loaded);
 }
 
 int wng_open(struct writer_node_group *g)
@@ -82,21 +64,50 @@ int wng_open(struct writer_node_group *g)
                        goto out;
                wn->chunk_bytes = ret;
                g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret);
+               wn->wng = g;
+               PARA_DEBUG_LOG("pre_select: %p\n", &wn->writer->pre_select);
+               PARA_DEBUG_LOG("post_select: %p\n", &wn->writer->post_select);
+               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);
 out:
        return ret;
 }
 
+void wng_destroy(struct writer_node_group *g)
+{
+       if (!g)
+               return;
+       free(g->written);
+       free(g->writer_nodes);
+       free(g);
+}
+
 void wng_close(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);
                wn->writer->close(wn);
        }
 }
 
+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);
+       unregister_task(t);
+       wng_close(g);
+       wng_destroy(g);
+}
+
 struct writer_node_group *wng_new(unsigned num_writers)
 {
        struct writer_node_group *g = para_calloc(sizeof(struct writer_node_group));
@@ -104,18 +115,13 @@ struct writer_node_group *wng_new(unsigned 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.error_handler = wng_error_handler;
+       g->task.flags = POST_ADD_TAIL | POST_EOF_IS_ERROR;
        return g;
 }
 
-void wng_destroy(struct writer_node_group *g)
-{
-       if (!g)
-               return;
-       free(g->written);
-       free(g->writer_nodes);
-       free(g);
-}
-
 void init_supported_writers(void)
 {
        int i;