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

diff --git a/write_common.c b/write_common.c
index de0502f5..a413d47e 100644
--- a/write_common.c
+++ b/write_common.c
@@ -37,17 +37,20 @@ static void wng_post_select(__a_unused struct sched *s, struct task *t)
 	FOR_EACH_WRITER_NODE(i, g) {
 		struct writer_node *wn = &g->writer_nodes[i];
 		t->ret = wn->task.ret;
-		if (t->ret < 0)
+		if (t->ret < 0) {
+			g->eof = 1;
 			return;
+		}
 		if (!i)
 			min_written = t->ret;
 		else
 			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,56 +60,61 @@ int wng_open(struct writer_node_group *g)
 {
 	int i, ret = 1;
 
+	PARA_NOTICE_LOG("opening wng %p with %d writer(s)\n", g, g->num_writers);
 	FOR_EACH_WRITER_NODE(i, g) {
 		struct writer_node *wn = &g->writer_nodes[i];
+		wn->wng = g;
 		ret = wn->writer->open(wn);
 		if (ret < 0)
-			goto out;
+			goto err_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);
 	}
 	sprintf(g->task.status, "%s", "writer node group");
-	g->eof = 0;
 	register_task(&g->task);
-out:
+	g->eof = 0;
+	return 1;
+err_out:
+	while (i > 0) {
+		struct writer_node *wn = &g->writer_nodes[--i];
+		unregister_task(&wn->task);
+		wn->writer->close(wn);
+	}
+	g->num_writers = 0;
+	g->eof = 1;
 	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)
+void wng_unregister(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);
 	}
+	unregister_task(&g->task);
+	g->eof = 1;
 }
 
-static void wng_event_handler(struct task *t)
+void wng_close(struct writer_node_group *g)
 {
-	struct writer_node_group *g = t->private_data;
+	int i;
 
-	PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
-	unregister_task(t);
-	wng_close(g);
-	wng_destroy(g);
+	if (!g)
+		return;
+	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];
+		wn->writer->close(wn);
+	}
+	free(g->written);
+	free(g->writer_nodes);
+	free(g);
 }
 
 struct writer_node_group *wng_new(unsigned num_writers)
@@ -118,7 +126,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 +142,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];