X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=cfdabe4821bc6af60a12b99f3c9c5ff0b03d60d5;hp=de0502f52c5ef3dd2cbb614857eb03c8c87e3470;hb=f5a29040feebefcec4472a67b3396b6bfae84f33;hpb=14f817d233309fe9ca2580fa8e4b78fd823b9ab9

diff --git a/write_common.c b/write_common.c
index de0502f5..cfdabe48 100644
--- a/write_common.c
+++ b/write_common.c
@@ -45,9 +45,10 @@ static void wng_post_select(__a_unused struct sched *s, struct task *t)
 			min_written = PARA_MIN(min_written, t->ret);
 	}
 	*g->loaded -= min_written;
-	if (!*g->loaded && *g->input_eof)
+	if (!*g->loaded && *g->input_eof) {
+		g->eof = 1;
 		t->ret = -E_WNG_EOF;
-	else
+	} else
 		t->ret = 1;
 	if (*g->loaded && min_written)
 		memmove(g->buf, g->buf + min_written, *g->loaded);
@@ -57,6 +58,7 @@ int wng_open(struct writer_node_group *g)
 {
 	int i, ret = 1;
 
+	PARA_NOTICE_LOG("opening wng with %d writer(s)\n", g->num_writers);
 	FOR_EACH_WRITER_NODE(i, g) {
 		struct writer_node *wn = &g->writer_nodes[i];
 		ret = wn->writer->open(wn);
@@ -92,6 +94,7 @@ void wng_close(struct writer_node_group *g)
 {
 	int i;
 
+	PARA_NOTICE_LOG("closing wng with %d writer(s)\n", g->num_writers);
 	FOR_EACH_WRITER_NODE(i, g) {
 		struct writer_node *wn = &g->writer_nodes[i];
 		unregister_task(&wn->task);
@@ -99,16 +102,6 @@ void wng_close(struct writer_node_group *g)
 	}
 }
 
-static void wng_event_handler(struct task *t)
-{
-	struct writer_node_group *g = t->private_data;
-
-	PARA_INFO_LOG("%s\n", PARA_STRERROR(-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));
@@ -118,7 +111,6 @@ struct writer_node_group *wng_new(unsigned num_writers)
 	g->written = para_calloc(num_writers * sizeof(size_t));
 	g->task.private_data = g;
 	g->task.post_select = wng_post_select;
-	g->task.event_handler = wng_event_handler;
 	g->task.flags = POST_ADD_TAIL;
 	return g;
 }
@@ -135,6 +127,7 @@ void *check_writer_arg(char *wa, int *writer_num)
 {
 	int i;
 
+	*writer_num = -E_WRITE_COMMON_SYNTAX;
 	PARA_INFO_LOG("checking  %s\n", wa);
 	FOR_EACH_WRITER(i) {
 		const char *name = writer_names[i];