X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=acf1d292a4a33ed8ed7ef2649382c9a2c3f4a3e8;hp=0b2772ae8ea4d6928b828aa8bb2e2c5916833309;hb=b564291f5f15b5bd4a319ea59875023551a705cc;hpb=37db6c718cbd9e350d46703c36dc6860477de476

diff --git a/write_common.c b/write_common.c
index 0b2772ae..acf1d292 100644
--- a/write_common.c
+++ b/write_common.c
@@ -28,6 +28,21 @@
 const char *writer_names[] ={WRITER_NAMES};
 struct writer writers[NUM_SUPPORTED_WRITERS] = {WRITER_ARRAY};
 
+static void wng_pre_select(__a_unused struct sched *s, struct task *t)
+{
+	struct writer_node_group *g = t->private_data;
+	int i;
+
+	FOR_EACH_WRITER_NODE(i, g) {
+		struct writer_node *wn = &g->writer_nodes[i];
+		t->ret = wn->writer->pre_select(s, wn);
+		if (t->ret < 0) {
+			g->eof = 1;
+			return;
+		}
+	}
+}
+
 static void wng_post_select(struct sched *s, struct task *t)
 {
 	struct writer_node_group *g = t->private_data;
@@ -36,75 +51,82 @@ static void wng_post_select(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)
+		t->ret = wn->writer->post_select(s, wn);
+		if (t->ret < 0) {
+			g->eof = 1;
 			return;
+		}
 		if (!i)
-			min_written = t->ret;
+			min_written = wn->written;
 		else
-			min_written = PARA_MIN(min_written, t->ret);
+			min_written = PARA_MIN(min_written, wn->written);
 	}
-	*g->loaded -= min_written;
-	if (!*g->loaded && *g->eof)
+//	PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_written);
+	if (min_written) {
+		*g->loaded -= min_written;
+		FOR_EACH_WRITER_NODE(i, g)
+			g->writer_nodes[i].written -= min_written;
+	}
+	if (!*g->loaded && *g->input_eof) {
+		g->eof = 1;
 		t->ret = -E_WNG_EOF;
-	else
-		t->ret = 1;
-	if (*g->loaded && min_written)
+		return;
+	}
+	t->ret = 1;
+	if (*g->loaded && min_written) {
+//		PARA_INFO_LOG("moving %zd bytes\n", *g->loaded);
 		memmove(g->buf, g->buf + min_written, *g->loaded);
+	}
 }
 
 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;
-		register_task(&wn->task);
 	}
-	register_task(&g->task);
-out:
+	sprintf(g->task.status, "%s", "writer node group");
+	g->eof = 0;
+	return 1;
+err_out:
+	unregister_task(&g->task);
+	while (i > 0) {
+		struct writer_node *wn = &g->writer_nodes[--i];
+		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);
+	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);
 	}
-}
-
-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);
+	free(g->writer_nodes);
+	free(g);
 }
 
 struct writer_node_group *wng_new(unsigned num_writers)
@@ -113,11 +135,9 @@ struct writer_node_group *wng_new(unsigned num_writers)
 	g->num_writers = num_writers;
 	g->writer_nodes = para_calloc(num_writers
 		* sizeof(struct writer_node));
-	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;
+	g->task.pre_select = wng_pre_select;
 	return g;
 }
 
@@ -129,22 +149,30 @@ void init_supported_writers(void)
 		writers[i].init(&writers[i]);
 }
 
-int check_writer_arg(const char *arg)
+void *check_writer_arg(char *wa, int *writer_num)
 {
-	int i, ret = -E_WRITE_COMMON_SYNTAX;
-	char *a = para_strdup(arg), *p = strchr(a, ':');
-	if (p)
-		*p = '\0';
-	p++;
+	int i;
+
+	*writer_num = -E_WRITE_COMMON_SYNTAX;
+	PARA_INFO_LOG("checking  %s\n", wa);
 	FOR_EACH_WRITER(i) {
-		if (strcmp(writer_names[i], a))
+		const char *name = writer_names[i];
+		size_t len = strlen(name);
+		char c;
+		if (strlen(wa) < len)
+			continue;
+		if (strncmp(name, wa, len))
 			continue;
-		ret = i;
-		goto out;
+		c = wa[len];
+		if (c && c != ' ')
+			continue;
+		if (c && !writers[i].parse_config)
+			return NULL;
+		*writer_num = i;
+		return writers[i].parse_config(c? wa + len + 1 : "");
 	}
-out:
-	free(a);
-	return ret;
+	PARA_ERROR_LOG("%s", "writer not found\n");
+	return NULL;
 }
 
 struct writer_node_group *setup_default_wng(void)
@@ -157,9 +185,8 @@ struct writer_node_group *setup_default_wng(void)
 	else
 		default_writer = 1;
 	wng->writer_nodes[0].writer = &writers[default_writer];
-	sprintf(wng->writer_nodes[0].task.status, "%s",
-		writer_names[default_writer]);
-	PARA_INFO_LOG("using default writer: %s\n",
-		writer_names[default_writer]);
+	PARA_INFO_LOG("using default writer: %s %p\n",
+		writer_names[default_writer], writers[default_writer].parse_config);
+	wng->writer_nodes[0].conf = writers[default_writer].parse_config("");
 	return wng;
 }