X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=70a9a0155ff4e0a9e1f9b5bccf1054f1ea7a5275;hp=f1c1e8f131f3500a326f8832c1d332c9d17cbbac;hb=f45846b1a228c806424e6bf937ba09e648e87441;hpb=df3c03e72911edb31e7f1e32ebe29dad063e3b70

diff --git a/write_common.c b/write_common.c
index f1c1e8f1..70a9a015 100644
--- a/write_common.c
+++ b/write_common.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file write_common.c common functions of para_audiod and para_write */
@@ -33,49 +21,43 @@ 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;
+	struct writer_node_group *g = container_of(t, struct writer_node_group, task);
 	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;
+		t->error = wn->writer->pre_select(s, wn);
+		if (t->error < 0)
 			return;
-		}
 	}
 }
 
 static void wng_post_select(struct sched *s, struct task *t)
 {
-	struct writer_node_group *g = t->private_data;
+	struct writer_node_group *g = container_of(t, struct writer_node_group, task);
 	int i;
 	size_t min_written = 0;
 
 	FOR_EACH_WRITER_NODE(i, g) {
 		struct writer_node *wn = &g->writer_nodes[i];
-		t->ret = wn->writer->post_select(s, wn);
-		if (t->ret < 0) {
-			g->eof = 1;
+		t->error = wn->writer->post_select(s, wn);
+		if (t->error < 0)
 			return;
-		}
 		if (!i)
 			min_written = wn->written;
 		else
 			min_written = PARA_MIN(min_written, wn->written);
 	}
-//	PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_written);
+	//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;
+	if (!*g->loaded && *g->input_error) {
+		t->error = *g->input_error;
 		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);
@@ -90,14 +72,13 @@ static void wng_post_select(struct sched *s, struct task *t)
  * \return If at least one open function returned an error, all successful
  * writer notes get closed and this error value is returned. Upon success, a
  * task associated with \a g is registered to the scheduler and the function
- * returnes a positive value.
+ * returns a positive value.
  * */
 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;
@@ -108,32 +89,18 @@ int wng_open(struct writer_node_group *g)
 		g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret);
 	}
 	sprintf(g->task.status, "%s", "writer node group");
-	g->eof = 0;
+	register_task(&g->task);
 	return 1;
 err_out:
-	PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-	unregister_task(&g->task);
+	PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	while (i > 0) {
 		struct writer_node *wn = &g->writer_nodes[--i];
 		wn->writer->close(wn);
 	}
 	g->num_writers = 0;
-	g->eof = 1;
 	return ret;
 }
 
-
-/**
- * unregister a writer node group task
- *
- * \param g the group whose task is to be closed
- */
-void wng_unregister(struct writer_node_group *g)
-{
-	unregister_task(&g->task);
-	g->eof = 1;
-}
-
 /**
  * call the close function of each writer in the given group
  *
@@ -169,7 +136,6 @@ 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->task.private_data = g;
 	g->task.post_select = wng_post_select;
 	g->task.pre_select = wng_pre_select;
 	return g;
@@ -192,7 +158,7 @@ void init_supported_writers(void)
  * \param writer_num contains the number of the writer upon success
  *
  * This function checks whether \a wa starts with the name of a supported
- * paraslash writer, optinally followed by a colon and any options for that
+ * paraslash writer, optionally followed by a colon and any options for that
  * writer.  If a valid writer name was found and further are present, the
  * remaining part of \a wa is passed to that writer's config parser.
  *
@@ -222,7 +188,7 @@ void *check_writer_arg(const char *wa, int *writer_num)
 		*writer_num = i;
 		return writers[i].parse_config(c? wa + len + 1 : "");
 	}
-	PARA_ERROR_LOG("%s", "writer not found\n");
+	PARA_ERROR_LOG("writer not found\n");
 	return NULL;
 }