X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=6ff778a92d0451ab0500c2dc8b88fbff02e30323;hp=e76d7f46a537a1c00f47dc055506d39e13cf9bc2;hb=2290d9be0703d3f83f38c2f100b1b41ec0790bb3;hpb=1b39496da38155b84636c0f7cee7f7dbbea33632

diff --git a/write_common.c b/write_common.c
index e76d7f46..6ff778a9 100644
--- a/write_common.c
+++ b/write_common.c
@@ -20,6 +20,8 @@
 
 #include "para.h"
 #include "string.h"
+#include "list.h"
+#include "sched.h"
 #include "write.h"
 #include "error.h"
 
@@ -70,6 +72,31 @@ out:
 	return ret;
 }
 
+static void wng_post_select(struct sched *s, struct task *t)
+{
+	struct writer_node_group *g = t->private_data;
+	int i;
+	size_t min_written = 0;
+
+	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);
+	}
+	*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)
 {
 	int i, ret = 1;
@@ -81,21 +108,49 @@ 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;
+		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));
@@ -103,18 +158,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;