X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=a28a1052564ca308cf343ccb5d6f08fdebf91d92;hp=50784cec6b8b7815c6969eb85b8088e35dd83dd1;hb=7cff238daecde2823204f6abfeb9a888161baa84;hpb=f23be61d476e3f354e31072da0e0e77050a8dc56

diff --git a/write_common.c b/write_common.c
index 50784cec..a28a1052 100644
--- a/write_common.c
+++ b/write_common.c
@@ -61,12 +61,13 @@ 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);
+	register_task(&g->task);
 	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->task.pre_select = wn->writer->pre_select;
@@ -76,8 +77,16 @@ int wng_open(struct writer_node_group *g)
 	}
 	sprintf(g->task.status, "%s", "writer node group");
 	g->eof = 0;
-	register_task(&g->task);
-out:
+	return 1;
+err_out:
+	unregister_task(&g->task);
+	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;
 }
 
@@ -90,6 +99,7 @@ void wng_unregister(struct writer_node_group *g)
 		unregister_task(&wn->task);
 	}
 	unregister_task(&g->task);
+	g->eof = 1;
 }
 
 void wng_close(struct writer_node_group *g)
@@ -117,7 +127,7 @@ 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.flags = POST_ADD_TAIL;
+	g->task.flags = 0;
 	return g;
 }