Add UNIT_START errno
[paraslash.git] / write_common.c
index d647202..acf1d29 100644 (file)
@@ -57,18 +57,26 @@ static void wng_post_select(struct sched *s, struct task *t)
                        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)
@@ -117,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);
 }
@@ -128,7 +135,6 @@ 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.pre_select = wng_pre_select;