X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=a413d47e2dd0d3c75d4ef26f7a630325685c5d14;hp=39f124f832dddb169ace064443629bead6be0f7e;hb=c04ac3f234670c8ba990c15605e1f3f6f2bf4780;hpb=b23afbb1d859a79a2682a80420a7f3c693b210e6

diff --git a/write_common.c b/write_common.c
index 39f124f8..a413d47e 100644
--- a/write_common.c
+++ b/write_common.c
@@ -37,8 +37,10 @@ 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
@@ -64,30 +66,39 @@ int wng_open(struct writer_node_group *g)
 		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);
-		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)
+void wng_unregister(struct writer_node_group *g)
 {
-	if (!g)
-		return;
-	free(g->written);
-	free(g->writer_nodes);
-	free(g);
+	int i;
+
+	FOR_EACH_WRITER_NODE(i, g) {
+		struct writer_node *wn = &g->writer_nodes[i];
+		unregister_task(&wn->task);
+	}
+	unregister_task(&g->task);
+	g->eof = 1;
 }
 
 void wng_close(struct writer_node_group *g)
@@ -99,9 +110,11 @@ void wng_close(struct writer_node_group *g)
 	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);
 		wn->writer->close(wn);
 	}
+	free(g->written);
+	free(g->writer_nodes);
+	free(g);
 }
 
 struct writer_node_group *wng_new(unsigned num_writers)