X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=dda60168276e9695b32e1e843b0dd00b64381b7d;hp=6c0faa7c18fb70c5421426bd81be0e207a41bc54;hb=8cec3d1edb26b4861e2b5bdbb9f70241cdd7f03b;hpb=b0cad48a864fe3f621138e717ff025060c396fad;ds=sidebyside

diff --git a/write_common.c b/write_common.c
index 6c0faa7c..dda60168 100644
--- a/write_common.c
+++ b/write_common.c
@@ -28,7 +28,7 @@
 const char *writer_names[] ={WRITER_NAMES};
 struct writer writers[NUM_SUPPORTED_WRITERS] = {WRITER_ARRAY};
 
-static void wng_post_select(struct sched *s, struct task *t)
+static void wng_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct writer_node_group *g = t->private_data;
 	int i;
@@ -37,17 +37,20 @@ 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)
+		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,15 @@ 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;
 		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;
@@ -79,34 +81,32 @@ out:
 	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 +118,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;
 }
@@ -131,22 +130,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)
@@ -161,7 +168,8 @@ struct writer_node_group *setup_default_wng(void)
 	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;
 }