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

diff --git a/write_common.c b/write_common.c
index 7fb8d123..a28a1052 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,16 +60,16 @@ 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->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;
@@ -74,29 +77,45 @@ 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;
 }
 
-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)
 {
 	int i;
 
+	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];
-		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)
@@ -108,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;
 }